labofsahil/github-event-dataset-2012 huggingface dataset:
Fix style nit


git-svn-id: svn+ssh://svn.freebsd.org/base/head@240355 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
forgotten file from r240346

Pointyhat to:	avg
MFC after:	10 days
X-MFC with:	r240346


git-svn-id: svn+ssh://svn.freebsd.org/base/head@240356 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Change the default to not use packet counters to generate rx interrupts.
Rely solely on the timer based mechanism.

Update man page to reflect this change.

MFC after:	1 week
Adding Git note for current refs/heads/master
Adding Git note for current refs/heads/vendor-sys/acpica/dist
Adding Git note for current refs/heads/master
Adding Git note for current refs/heads/stable/7
Adding Git note for current refs/heads/stable/8
Adding Git note for current refs/heads/stable/9
Check vplabel for NULL before dereferencing it.  Fixes a panic
when running atop with MAC_MLS enabled.

Submitted by:	Richard Kojedzinszky <krichy@tvnetwork.hu>
Reviewed by:	rwatson
MFC after:	1 week
MFC r235864:

Upgrade our copy of llvm/clang to 3.1 release.  Release notes can be
found at: http://llvm.org/releases/3.1/docs/ReleaseNotes.html
MFC r236503: free wdog_kern_pat calls in post-panic paths from under
SW_WATCHDOG
No memory barrier is required.  This was pointed out by kib@ a while ago,
but I got distracted by other matters.

(for real this time)
imagenes2
Added link to Serbo-Croatian translation of README
Training 2012-07-19
Update version info to 3.8.0
science: Include indirect ch4 rf effect

Added another factor to the radiative forcing equation for ch4 that
increases rf for ch4 by 40% as was done in the computation of the gwp for
ch4 in AR4.
[FABRIC-275] Zookeeper default session timeout can now be overriden by system properties.
Modified tooling-jclouds-all uberbundle to also include META-INF/services and an activator.
[FABRIC-307] fabric:create will now reuse credentials if they are already cached.
Improve ManagedServiceFactory and add clear json data for elasticsearch group
arreglando 2.0
Changed login.ejs
fix issues in conf object
Start adding ownership control for email db
Added APP_RUNMAT syscall and respective header definition.
Oops, didn't actually add one of the files. I guess I should use git more often.
Updated README.md
0.1.2
Bumped to version 0.1.2
Better version of evaluate_choices(), and some cleanup.
Ensuring that status is updated only once per statement (fixing a 9.3 error)
Version 0.1.3
new tool to query TCGA for UUIDs, add them to a maf, and shift columns accordingly
Added album list @ Artist view page
Logic untuk follow sudah benar
Added gifgag app. Added a terrible example of how we can override mezzanine views/templates.
using canonical maven-source-plugin groupId and version
add one test

for test only
多くの行に変更を加える
Added RedmineUserService
Changed using ConnectionUtils
Added cookie suport
Fixed non admin user could not login with Redmine
Merge pull request #34 from mallowlabs/redmine

Added RedmineUserService
Eliminate iterators in genjar
IGV split view if multiple rows are selected
BUGFIX (Bug #886): matrix is now responsive to scale changes when a Z-Score Analysis is loaded
fix note spacing
Update make_shared_array and allocate_shared_array
some sequence tests.. .still need more
authenticateion 2
revise default precision for axis tics spanning 0
Bump version number of installer to 4.7
New make target for zip file distribution
deleted an extra line
deleted an extra line
Se cambia el menu de login para consistencia con iOS
update xmonad.hs
add commented out unicode-haskell vim plugin
make room for a tray with xmobar
use trayer and nm-applet
Tweet jobs when they're approved
add links to creamer and coffeecup-helpers
lazbuild: IDE profile clean all: clean before build

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@36493 4005530d-fff6-0310-9dd1-cebe43e6787f
fpvectorial: Starts skeleton for LAZ format support

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@37292 4005530d-fff6-0310-9dd1-cebe43e6787f
Fixes a bug in the code to iterate accessible objects, it didnt work, now it does

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@37159 4005530d-fff6-0310-9dd1-cebe43e6787f
LCL: published missing properties TCalendar.Hint and TCalendar.TabOrder.


git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@37160 4005530d-fff6-0310-9dd1-cebe43e6787f
anchordocking: changestamp for options

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@37021 4005530d-fff6-0310-9dd1-cebe43e6787f
Win Installer: optional add pre-compiled chm help files

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@38001 4005530d-fff6-0310-9dd1-cebe43e6787f
LCL-Android-Example: Starts implementing exception handling in the sqlite code

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@39433 4005530d-fff6-0310-9dd1-cebe43e6787f
MAKE DEB: Override lintian warnings about spell errors false detections.


git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@36343 4005530d-fff6-0310-9dd1-cebe43e6787f
IDE: removed unused string

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@38738 4005530d-fff6-0310-9dd1-cebe43e6787f
Leave one point in empty cells
GRIFFON-559 correctly override settings based on environment
Debugging code for int 0x13.
Update notes for submitted changes

* only use CPU_COUNT if it's available
Add some valgrind suppressions for Mac.

Should suppress valgrind warnings that currently affect all changes
submitted to the master branch.

Change-Id: Ieab8fb3a6f094b07eb069836be0782473850301c
Update notes for submitted changes

* Small fix for g_tune_pme
Fixed Pulp Fiction quote

Fixes 1011

Change-Id: I40bfdca8906505a8a619c6ba2db924a50b830af5
Merge "Fixed Pulp Fiction quote" into release-4-5-patches
Fixed uninitialized vars, and array overwriting itself.

Change-Id: If6f6233e0ca8dd788d255a69c8e740ac6af83011
doc: remove needless news
httpd: don't use short-hand conditional expressions
Fix prefix

Use default_ prefix instead of grn_ prefix because the lock object is
just for default query logger. It is not used for general query
looger.
dom0+vm/usb: sanitize data (USB device names) read from xenstore before use
Some doco fixes
solved force close on startup problem
move parser & checker to utilities directory
adding downloader
adding soon page
Remove number of tokens left from emails
Finish user edit, update, index and destroy actions
Finish user edit, update, index and destroy actions with .gitignore
Finish user edit, update, index and destroy actions
Merged master fixed conflict in .gitignore
0012 Added Tests
0012 Added Tests
0012 Added Tests
jqueryupdate2
121318
Define CD Base Directory Using CDPATH
Update to version 0.4.0.
Restrict slide property key values to \w+.
Add padding for CODE inside LI.
Remove empty P elements.
Moar slideshows.
Merge pull request #20 from torgeir/master

More slideshows created with remark.
Merge branch 'master' of github.com:gnab/remark
Make slides initiated with two instead of three dashes continued slides automatically.
gem:34 first
gem:34 second
gem:34 third
Last fix before merge.
woohoo all except block expansion
Forgot to push TNT.
Merge branch 'master' of github.com:h31ix/AntiCheat
Fixed issue with shears and leaves
Merge branch 'master' of https://github.com/h31ix/AntiCheat.git
Merge branch 'master' of github.com:h31ix/AntiCheat into development

Conflicts:
	src/main/java/net/h31ix/anticheat/util/Utilities.java
random stuff
Merge branch 'master' of github.com:hackfm/gamehack
Shinier
Show repo list
Zeus and rspec applescript
Added run in terminal helper script
Open *.bashrc files in sh-mode
added cperl-indent-subs-specially nil

- https://gist.github.com/4076002
- http://d.hatena.ne.jp/syohex/20120818/1345302707
modified _vimrc

- added ff_table
- changed statusline
- changed insert-mode notification from CursorLine to StatusLine
changed the modeline
Merge branch 'master' of github.com:hayajo/dotfiles
- ‘SparkleShare (Hylke Bons, Apr 18 15h04) copy 4 (another copy).txt’
5 minutes to see emulator
Correct repository type: github -> git.
Cleaning up

Signed-off-by: Gerco van Heerdt <gercovanheerdt@gmail.com>
Remove identd text event coz it doesn't work
Move verbose message
Move "not defined" messages to verbosity level 3

Normal users would not be interested in this nor would they be able to
do anything about it.
fix: receive command log format.
checkpoint small updates
ulimit -s unlimited added to runvasp
Add ryu runner on tornado.
Merge branch 'master' of http://github.com/hkwi/hkwi_seeds
update youtube regex
Closes #2... build a runable JAR file
deploy private key if found in config dir
doc update: add sample jgroups configuration file with explanation
Merge pull request #522 from gaohoward/master

doc update: add sample jgroups configuration file with explanation
Render intro
Can add more text into title shown by getNomUrl
Fix: uniformize code
Merge remote-tracking branch 'dolibarr/develop' into develop
Move the C++ part of the android wrapping here.
Special case for GL_ZERO blend factor too. Don't log on "sync".
WEBLITORAL
Now version is .86

Modified: include/help.c
Dont know if this works
added restart.sh script for easy restart update & restart
added comment flag to page & post
Fixed broken include paths
Добавление функции поиска
add 2 scripts

dnspodsh.sh for update dns record through dnspod api

remove_file_attrs.sh for remove file attris under mac
Made -n a short form of --nstreams
added retry on fail during buildList
error catch and -n flag allowed
add stec
some shaman update
Add NRCreation
Rolled back behavior since I apparently forgot how static inheritance works.
Fix using NIOverviewView class on non-DEBUG build.
first commit
somethine
Merge branch 'master' of github.com:indiresh/Group5
make reductions have the correct id
9.2 Set up model relationships
9.3 Add the Add to Cart button
Se corrgio la lista de departamentos.
Changed deploy:test:all to deploy:testall
popup style
merge
Merge branch 'master' of github.com:inlined/GetWell
android capture imll

camera working but lacks configuration
Merge pull request #1593 from intchanter/develop

Develop
Fix #1584
Update IPython/frontend/terminal/interactiveshell.py

fix issue #2419
Merge pull request #2420 from teegaar/master

Pass ipython_dir to __init__() method of TerminalInteractiveShell's superclass.
include execution_count in pyin msgs, closes #1619
documenting updated messaging protocol
Merge pull request #1620 from ivanov/pyin-execution-count

Set the `execution_count` field for pyin messages.

Closes #1619.
Added new abilites for checking movesets.  Messed around with droppable with little luck.
.gitignore *.pyc
Consolidate lexing in nextsymbol()
Moving call to string lexing into nextsymbol
Turn Reader into an iterator
Return terminating quote with strings
Split readuntil into two lexing functions for strings and for everything else
Ensure completeness of \-escapes with a regexp
Restored accidentally broken default engine
Use built-in substring search instead of regexps. More efficient for strings with lots of \-escaped characters.
More tests for strings
Use [-1:1] instead of strip('"'). The latter removes *all* quotes from both ends.
awld-scope test
pelagios module
Merge branch 'master' into gh-pages
Fixed a crazy typo :)
Win7 26oct2012 22:11
kliniklangertdk-0.05
elimine parsetab.py del repositorio, se autogenera cuando se corre el parser
fixed route for first version of create module
moved list into right panel
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/app/module/Create2Module.xml
updated .emacs file to include undo-tree include
Atualização de POM
Update to Architecture
Add remove images in doit task.
basic dealer functional
Added a page that allows users to track, remove and edit uploading sessions in the GeoNode.
Cleaned up error handling when a upload process goes wrong on the main page.
Added a view that returns an user's upload sessions to allow the client to render it via javascript.
Associate a layer with an upload session
Added a link to the upload status page.
golden-ratio isn't necessary for me
Added file with configuration for git aliases.
Fix is a word of the day!
designing v2 interface
Add corresponding wrap templates
add module LSD: Line Segment Detector
add class LineSegmentDetector
construct edge map
Changed db file location to absolute path to make Apache happy.
Added Django admin media to static file directory.
Fix broken JS specs for Heap.User#defaultHeaplog.
Switch to ratchet for CSS and layout. Working so far.
(Unsuccessfully) attempt to get Cucumber/Capybara/Poltergeist to work nicely.
Attempt to get Terminus to work. No luck so far.
Must closer to having Terminus working, as per @jcoglan's suggestions. Proxy still appears to not actually return the original page's content however.
Dumb typo.
Move terminus to vendor/gems to shut Rails up about old-style plugins.
Make cukes pass on Chrome using Terminus.
Finally, the entire suite passes - I'm looking at you Cucumber.
Move better_errors out of test, since it's causing Ruby to segfault. BOOM
Use precompiled assets for cucumber, apparently there's something up with Terminus' proxy which causes the last two bytes of the application.js not to be sent to the client.
Use dymamic method dispatch instead of lame old case statement.
JBPAPP-10301 Make product.conf configurable via env var
AS7-5870 Services should only be created when the resource adapter is activated
AS7-5870 Fixing test regressions after JBAPP-10281 patch
AS7-5870 Fixing test regressions after JBAPP-10281 patch
fixup
[AS7-5785] Allow usage of other log managers for standalone and embedded usages.
Decremented index for calc_prob
Update src/Symfony/Component/Validator/Resources/translations/validators.es.xlf

new spanish validator
removed global declaration of Corpus object
removed Greek-specific methods
added Greek-specific methods
moved Hdt. Bk. 1 files into HDT1
removed Greek-specific functions from the select() menu
added select() function to provide a menu for Greek-specific functions
fixed mistake in shift + r keybinding
29 re-add "edit group" link
Begin writing shim
BUGFIX://The modelBinder now handles the include field in case if it is null
Removing things from heuristic that are no longer necessary.
06/06/2012 - 6

- WorldGenerator fully implemented
- Fixed inputting entries in GUI text fields
- Fixed bug in WorldChecker
ajout page de creation d une recette, avec la methode rest POST associée
Proxy #last.

Fixes #169
reschedule DeferrableBody#close! if a dequeue is scheduled
remove jquery dep from integration spec
refactor all Handlers to use DeferrableBody
#chunk queues content if connection isn't already open
use #chunk to stream downstream response bodies instead of a callback
move non downstream code out of em-synchrony block
Added Predicates for handling Volume and Snapshot Status. Improved some comments.
Merge pull request #986 from rackspace/vol-snap-status-predicate

Added Predicates for handling Volume and Snapshot Status.
Merge pull request #459 from grkvlt/admin-catalog-fixes

Issue 830: Admin catalog fixes
issue #1108: remove eucalyptus and related providers
issue #1108: remove special casing of eucalyptus
Merge pull request #1115 from jclouds/remove-eucalyptus

issue #1108: remove eucalyptus and related providers
Remove the File store.
Created structure for moving iwk: protocol to a JSC binding implementation. Started with method deleteAccount.
hide south pane
put myXPConfig back inside myKeys
Add skybox method
Revert "Add skybox method"

This reverts commit 49b2a265998dee0f5c50f5503d7f095056e717b1.
Add skybox method
Use size argument
Use skybox instead of particle system + fog
Add artists credit file
Add belt skybox

It's still glued together the wrong way...
Add nebula skybox
Typo
Merge branch 'develop'
Merge branch 'master' into gh-pages
removed nil last aired from queries
Added dispersylauncher.
seek command: added [ -C --no-color ] option.
heroku setup
heroku fixes
removed public/index.html
froze deps
Release 0.1.0alpha5
add licensing information (gplv2)
New graphics, fixed some bugs and minor issues
Added -j support to rake.

Rake now has a thread_pool implementation which returns futures when passed args
and a block. MultiTask has been changed to ask the thread pool for a list of
futures in which inside each a prerequisite is completed. MultiTask then waits
on each future until it is complete.

The number of threads in the pool is controlled with the new -j option at the
command-line.

The thread pool is now a member of Rake.application and rakefile authors can request
futures for their own operations, participating in the pool.

The thread pool is special in that it will spawn a new thread when a thread in the pool
is sleeping because it is waiting for a future being completed by another thread. When
the new thread is finished, the pool size will shrink to where it was previously.

With this change, the pool always has a number of threads actively doing work (that
number being equal to the -j parameter).

This commit also includes documentation for the new -j parameter and a test for the
ThreadPool implementation.
Added test verifying results from the futures.
Merge branch 'added-thread-pool-to-multitask' of https://github.com/michaeljbishop/rake into mjb-pool

* 'added-thread-pool-to-multitask' of https://github.com/michaeljbishop/rake:
  Added test verifying results from the futures.
  Added -j support to rake.
reorder version the way I like it.
very minor test cleanup
whitespace removed
Merge branch 'mjb-pool'

* mjb-pool:
  whitespace removed
  very minor test cleanup
  Added test verifying results from the futures.
  Added -j support to rake.

Conflicts:
	lib/rake/application.rb
scripts: build-fix, some improvements

To catch more.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
scripts: instrument, improve

To have an assert in all files.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Prepare: do not remove library functions

Like memcpy, memset etc. We want them in-place.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
[纪秀峰]:gitconfig

受影响的文件:
    .gitconfig
[纪秀峰]:gitconf

受影响的文件:
    .gitconfig
[纪秀峰]:git br

受影响的文件:
    .gitconfig
[纪秀峰]:b = branch -a -v -v

受影响的文件:
    .gitconfig
[纪秀峰]:br

受影响的文件:
    .gitconfig
[纪秀峰]:space

受影响的文件:
    .gitconfig
[纪秀峰]:space

受影响的文件:
    .gitconfig
uploaded VisualER
defend self against ruby_parser 3.x

which outputs error to STDERR and changes quite a few things
rework mutations: mutate intermediate trees too
add option to Mutation#apply

:update/:re_apply/:force_update
missing end quotes
Implement getting result path.
Implemented quoted keys.
archive/tar: avoid writing ModTime that is out of range.

Update issue 4358
Still to do: support binary numeric format in Reader.

R=golang-dev, rsc
CC=golang-dev
http://codereview.appspot.com/6818101
Update src/GeoExt/data/FeatureStore.js
Added rinari, magit, and clojurescript
Merge branch 'master' of github.com:jodonnell/emacs
Fixed variable name clash.
@mentions are now clickable
Merge pull request #1 from joepie91/customtypes

Add Domain class
Updated user functions to include better password hashing and logins.
Added login function and new password hashing.
Fixed misc bugs in last release.
1.3 update
Merge branch 'master' of github.com:joeto/j2mc-chat
Tweak curl.h config.m4 check
Decrease text size on branch view to 15sp
Use lighter background color for HeaderListItem
Add path header from RepositoryCodeFragment.onViewCreated
Use normal textStyle for file name
Use same background for all list items
Use dark colors for branch footer
Add tests of RefUtils helpers
Remove extra newline
Move dp to pixel conversion to ServiceUtils
Remove unused view elements
Code Icon Change
path_item padding
Add helpers to set and schedule item updates
Only center path text vertically
Make setIndented method fluid
Add newline after call to super
Store all initial paddings
Properly convert pixels from float to int
Use text/x-sh mode for .zsh files
Remove incorrectly checked in JARs
finishing Seelpe::ConstraintSet
Update mod_slogin/mod_slogin.xml

Изменение версии модуля до 1.3
Cucumber is green
Add screenshots link to README
added key metrics
adding three more
Updated title on the documentation to be more friendly to people that has many tabs open. "Meteor" gets confusing when you have both the documentation, and say, the examples open at the same time, as they are both titled "Meteor".
Bump test timeout. We need a better solution.
tests don't prompt for auth in Chrome
Add heartbeat timer so we notice when the server silently goes away.
Add mongodb third party notices.
De-duplicate MIT and Apache licenses.
Add dependencies of node packages we use.
A couple more missed items.
Remove unused font.
Consolidate a bit.
Merge branch 'license' into devel
better errors for unknown helper or reserved name; fixes #151
fix LiveRange destroy(true) and add tests; fixes #142
Fix "Cursor is closed" intermittent error.

If the initial _doPoll didn't complete before the first markDirty, two doPolls could be running at once, causing badness.
revert Chrome auth test workaround (Chrome works again; broke IE7)
break out httpcall timeout test
improved docs wording introducing is_client/is_server (see #157)
first cut of new HTML scanner
better error messages
semicolon
First shot at a read me
Threading and socket enhancements.

Signed-off-by: Joshua Piccari <joshua.piccari@gmail.com>
MIFOS-5583: Fixed the negative balance when penalty or fee was waived
MIFOS-5763: Fixed editing number of installments and disbursement date on GLIM accounts Disbursement Dates for member accounts in GLIM and fixed existing member accounts.
Update metamodeling/constraint_metamodel_experiments/README.md
Import devel/p5-Module-Install version 1.06
Import devel/p5-Module-Starter version 1.58
Import net/p5-Net-Frame-Dump version 1.13
Import devel/p5-Getargs-Long version 1.1003
Import www/p5-Nginx-ReadBody version 0.07
Import www/p5-Path-Class-URI version 0.04
Import devel/p5-Carp-Datum version 0.1.3
Import devel/p5-Path-Resource version 0.072
Import net/p5-Spread-Message version 0.21
Import devel/p5-String-Checker version 0.03
Import devel/p5-Test-Singleton version 1.03
Import x11-toolkits/p5-Tk-FileDialog version 1.3_4
Import www/p5-CGI-ArgChecker version 0.02
Import x11-toolkits/p5-Tk-HistEntry version 0.43_4
Import x11-toolkits/p5-Tk-JComboBox version 1.14_5
Import devel/py-TGScheduler version 1.6.3
Import textproc/p5-Tk-XMLViewer version 0.21_3
Import www/py-flask-cache version 0.4.0
Import www/py-pastedeploy version 1.5.0
Import devel/py-geojson version 1.0.1_1,1
jslint error cleanup. fix less 1.3 reference
Merge pull request #939 from adobe/jason-sanjose/jslint-fix

jslint error cleanup. fix less 1.3 reference
make clean production
Removed pyc files
Added tastypie resources
Added blog template and view
Updated example slightly
Organization of test and benchmark code
Remove old tests directory
Test infrastructure added to Makefile
Added generic 'c' function for complex numbers
More testing fixes
Added tests for control flow, parameter passing, vector indexing
More coverage tests
Fixed or commented out tests
Tests all passing
Fix wording in README
Prepping up the piece 1
Cut more arcs out of Chord Diagram for performance
test
test
test
test
Week3
Week 3 part 2
Took out breakpoints
Fix byte_buffer memory copy
123 añadido
joder
gotoAndPlay/Stop to labels is working.
crosstab reports
Grid (#14) API getting stable, tests and bugfixes
Main window basics file
Add useless stuff to gitignore
Adapted the GUI and input verifiers to work with the new Algorithm framework. Implemented new GUI workflow [search method -> algorithm].
myfund
add
added
added
Merge branch 'master' of https://github.com/jveiga/dotfiles
changed vim
jveiga
Bump to 0.0.1.alpha.13
Fixed accessible attributes from the specification
Tekstdingen in console werken
Tekstdingen in console werken
Merge remote-tracking branch 'jw/master' into ConsoleBranch
Merge remote-tracking branch 'jw/master' into ConsoleBranch
minor bugfixes
merge with erik
fixed some stuff
Updates to Index UI changes
Envio nueva imagen
parsing http response
added my images

added images
Undoing the series of today's commits to a base level of last night
Update kWidget/onPagePlugins/chapters/chaptersView.css

Another iteration on duration
moved KalturaAnalytics bootstrap past point where callback is defined
switched changeMedia to kWidget.embed
Added test file with Pre/Mid/Post rolls
Lots of changes for issue #59:
* Added test page for Multiple Ads from uiConf and Cue Points
* Removed old CuePoints3Ads test page
* Refactor kCuePoints code to trigger pre/post rolls at build time
* Change AdOpportunity to handle pre/post roll separatly from
* midrolls/overlays
continue to work on issue #59
* Added MultipleAds test file
* Support for Multiple Pre/Post rolls
added the multipleAds.html file and removed dependency for $uiConf
in testing cuePoints on iPad, noticed seek issue on fallback creating double seek, fix this by checking if current time is already close to the target before re-issuing seek
merged develop
Merge branch 'cuePointsRefactor' of github.com:kaltura/mwEmbed into
cuePointsRefactor

Conflicts:
	modules/EmbedPlayer/mw.EmbedPlayerNative.js 
		-- sync seek changes 
	modules/KalturaSupport/mw.KAds.js 
		-- fixed notice top additions for notice to not block title
Merge pull request #61 from kaltura/cuePointsRefactor

After syncing with develop, we can now merge this into 1.6.12 we should do some more integration tests now that its integrated.
* moving in place README.md
Removed reference to obsolete java script in acquia_marina theme that was casing page not found errors.  See:  http://drupal.org/node/1420146
Merge pull request #553 from karlnapf/master

debug messages for x-val
Merge pull request #554 from karlnapf/master

minor fix
fix java modular examples
fix c# and ruby example to work with new SGVector
Added rejection strategy handling to multiclass machine
Fixes for Qtest rejection strategy
Added Element-wise Product Kernel. This Kernel is based heavily on
Combined Kernel
Merge pull request #555 from puffin444/master

ProductKernel
use appropriate label types for ruby modular
fix ruby example
create *public* kernel_function method to be overidden in directorkernel
Removed a few doc warnings
add some helper functions for director kernel
added missing virtual function to DirectorKernel
deleted spaces
Merge pull request #557 from gsomix/director_kernel

preliminary version of DirectorKernel
let example exit sanely when shogun wasn't compiled with directors
enabled
Starting input support
Support Arduino-1.0
activate admin site, add models, add the add_blacklist API that add target to black list
make console flushing customizable
rename
renamed
Merge branch 'master' of http://github.com/kentat/dotfiles
renamed
Proper duplication leave
- Update appassembler plugin to 1.2.2
- Fixed log4j dependency.
- Fixed README.md
ThoughtForTheDay
added someClass.java
Refactored
removed a class
(cargo) cleanup
(cargo) futzing with default to system level install
(cargo) futzing with default to system level install
(cargo) futzing with default to system level install
(cargo) now try defaulting all to one of {local, -g, -G} -> local and -g work ok...
(cargo) cargo [-g | -G] [init | sync | install] without special case install works
Change Setting file, add create to word page.
Fixed body's top padding by adding <style> tag to main.gsp head as shown in the bootstrap examples. Fixed cursor:pointer problem in some listings.
booking only valid if persons > 0
Added [api] config options to README
Add Biniding
Arrows are now WASD, jump is now right-click for more mouse control. Firing and bullets still WIP - new code in items.rb
Removed database cookbook
z-index 修正
Revert "Revert "12.07""

This reverts commit db6e72bac4bf6f9bef1c5a794c2e14a0135bafe0.
Fixing unit test failures in Cisco plugin

Bug #1038565

The tests for bulk resource creation failure were failing since the bulk
API calls were not getting relayed correctly to the virt_phy_sw.py, that
has been fixed
There tests for the network_multi_blade_v2.py were failing since DB
initialization order was incorrect.
The tests in test_api_v2.py were failing since the plugin instance was
not being reset for each test.

Change-Id: I449bd8a61c1f61f98a97acf489574624fe309caa
Get OVS port details from port ID

Fixes bug 1037443

This address the issue when a Quantum interface does not start with the
prefix "tap" (for example interfaces created by the l3 agent)

Change-Id: Ie2c98940d921606906015914ce6b23d3095e91f2
Merge "Fixing unit test failures in Cisco plugin"
Merge "Get OVS port details from port ID"
fix associating a floating IP during floating IP creation.

bug 1038962

also add check to make sure that floating IP's are only associated if
the upstream router has a external network gateway to the appropriate
external network.

Change-Id: Ie4cb632296ce4a1cb989242eb894d73a7488cdb3
Split core and latex out so we can document them.
ibid.
Include the files.
Autocompile
Parens
Use quotes, after all.
Some heap operations; fixed size, though, unfortunately.
Rebuilt player.
adding open graph crap to blueprint content detail
Minor fix to dialogs.hpp
Added first-run cache download. Fixed game install error reporting.
File system watcher is now more independent, since WatchDir no longer
needs a reference to PluginManager
WatchDir is refactored and moved to the fileSystemListener package.
Refactor

* It's now possible to select the MockSource via CLI
* For that, add a SourceFactory that returns a specialized Source
  instance based on the source id ('mock', 'ping')
* MainWindow no longer depends on PingSource but rather on its interface
  'Source'
* Fixup command-line argument parsing
* Other API fixes
Improve appeareance
Big changes

menu changes, jQuery changes, style changes, move primary menu above header wrap, start some template changes
Added user and usergroup constants.
CRUD UI + Sterling
Added combine-pdf.hs
Added comments
implementing symbol tables and types
disable debug
Revert "dynamic fsync enable"

This reverts commit dbeea5f72b10f344f3cc4441ad3aed8b0a8eea1b.
V0.4.3

Cleaned up code, improved Tumblr functionality.
commandNoの扱いが腐ってたので修正

- 症状
コマンド投げまくるとcommandNo不正って言われて切断される

- 原因
C->SがSに届きS->Cをするが、それをCが受け取る前にCがC->Sを送った時に
今までの方法じゃCommandNoが一致しなくなる

- 対策
Serverは送られてきたCommandNoが前回+1かだけを見る用にした。
S->CのcommandNoは現在使用されていない。
initial input
Outline added
Add geventdaemon for fixing problem with python-gevent + python-daemon
Updating the readme to write to do
moved faker gem to all envvironments
fix bug surrounding cookie session driver.
fix eloquent->delete bug.
incremented version and change log.
Added a small example on how to call a function in blade :P
Merge pull request #624 from CoolGoose/patch-1

updated templating docs a bit with a function example
Add tmux-ro.sh script
new file for CommandTypes
first version of my fork
explicitly include Calabash::Android::Operations
made the tif icon show up
@arr2036's fix for #453.
Merge branch 'master' of https://github.com/github/gollum
Proceed with highlighting if one code block fails
Merge pull request #454 from kislyuk/master

Don't stop highlighting if one code block throws an exception.
Add a method that returns a given page name scoped to a directory.

This is to allow access to non unique pages.
Merge pull request #455 from ennova/scoped-page

Add a method that returns a given page name scoped to a directory.
Send path when renaming pages.
Fix nil error on editing a non-existent page.
Use baseURL on delete.
Path is now sent on rename.
Merge branch 'master' of https://github.com/github/gollum
Make wiki.page directory aware.
Remove scoped_page.
Refactor app.rb to use paged.

Create new pages relative to current directory.
More refactoring.
Fix delete.
Move new page dir logic to JS.
Add home button.
Update gemspec.
Fix #453.
Add support for embedded page metadata.
Merge pull request #419 from trans/metadata

Add support for embedded page metadata.
Merge branch 'master' of https://github.com/github/gollum

Conflicts:
	gollum.gemspec
Fix for plus instead of spaces in new pages.
Add connect to server
Add handshake protocol.
Redesigned controling module.
Add client protocol.
Add server-side protocol.
Add local socket implementation.
Connect server operations.
Cleanup previous garbage.
Fix signal connections.
Fixes double free bug.
Add missing actions.
Fixes socket implementation.
Add command handler.
Remove padding processing from rtp entirely

Actually we just can't touch payload anymore. It could contain encrypted
content and adding/removing a singe byte will definitely ruin the process
of decoding.

Someone must deal with payload on the upper level) - we deal with the
"transport" layer only.

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
[maven-release-plugin] prepare release JavaEWAH-0.4.2
Updated by ALF automation.
files for server smoke tests
Updated by ALF automation.
Updated by ALF automation.
Updated by ALF automation.
Updated by ALF automation.
Updated by ALF automation.
Make wraparound work if you're at the ends of the hue slider
Add JSDocs to color editor code, plus a few other code cleanups:
- Clean up two args that were being fed jQuery objects but treating them as some other type
- Remove unneeded bind() calls
- Change swatches prop to an arg of addSwatches(), since it's only used that one time
- Rename a few members for clarity (lastColor -> originalColor; addFieldListeners -> addListeners; colorRegEx -> COLOR_REGEX; _getNewOffset()'s args)
- Replace defaultColor "const" with a literal in getColor() (only place it was used)
- Simplify setColorAsHsv() by using $.extend() & removing unneeded intermediate vars
- Remove redundant synchronize() call in bindColorFormatToRadioButton()
- Remove redundant textfield content reset in commitColor()
- Remove seemingly unneeded `!colorLabel` check in InlineColorEditor.setColor()
- Split selectedColors var in InlineColorEditor.load() so its type doesn't vary
Color picker code cleanups:
- Move creation of ColorEditor DOM into ColorEditor instead of making each
  client do it on their own
- Change undo/redo key handling to a single bubble listener at the top of
  the colorpicker DOM, simplifying other key listeners (see #2200)
- Fix bug #2202 (unit tests leave stray global mouse listeners) and remove
  the fallback code in getColor() that was masking it
- Change usedColors() to a simpler impl using a map to uniquify
- Fix crashes in handleHslKeydown() due to wrong 'this' (see #2199)
- Rename setColor()'s arg for clarity
- Add bug #s to TODOs
Add underscores to private methods/fields in ColorEditor & InlineColorEditor.
Leaves a few methods public: ColorEditor.focus(), getColor(), setColorAsHsv(),
undo(), redo(); and InlineColorEditor.getCurrentRange() and its various
override methods.

Also rename a few other methods/args for clarity.
Add expand/collapse triangle icons to Find in Files search results headings
(which were already collapsible, just with no visual cue making it apparent).

Also clean up jsTreeSprites-related CSS styles: use constants that mean
what they say; remove unused (& broken) "disclosure-arrow-*" styles; move
"ins.jstree-icon" style into jsTreeTheme.less.

And also reduce code duplication in jsTreeSprites.svg.
add asp, aspx, jsp, jspx file extensions to server file list
jasonsanjose/i18n-readme
Fix issue 2138 by updating this.hsv when commitColor call fails to update it.
Fix Shift-Tab key issue by setting focus to parent li tag instead of the .value label.
Add A-Z to the regular expression that detects 6-digit hex colors.
Redraw highlight when Brackets is activated.
Add comment
Update to getting started guide to reflect HTML auto-reload.
omit ALF paragraph
Merge pull request #2209 from adobe/jasonsanjose/i18n-readme

jasonsanjose/i18n-readme
Try disabling some mongo logging as it seems to be crashing
stepsize for busstop range slider
Improved design of control element
added github banner
added license information
changed title
added README
Fix memory leak in cp_r
Update submodules and remove unuse bundles.
Use Ctrlp Instead of Fuzzyfinder

1. add Ctrlp submodule and configurate it.
2. remove FuzzyFinder and Fuzzyfinder_textmate submodules.
fix header not found
fix setup.py and udt.py
add sample recvfile.py script
move source/scheme.h to include/scheme.h
Fixed SQL generation error using an array of enums.
Insert epigraph
测试 css和img文件
修改了路由文件并且增加了地一个控制器、模型和视图
-- delete docs
修改季度
Merge branch 'develop' of https://github.com/lnczx/lnc-hj-os into develop
提案列表去掉了提案级别
gui fix for linux
More database work, rather than interface
changed the way selections are made
changed selection mode and added more comments to relaxengine.h
Added jquery file upload plugin: https://github.com/blueimp/jQuery-File-Upload
Added some depenences.
New uploader based on javascript for Tidypics
Removed flash slideshow.
Removed slideshow from plugin.
Added support for colorbox.
Ajax views was messy and wasn't resizing well, moved to only images.
Fixed image full view lightbox.
Added default title to images.
Merge branch 'colorbox' of git://github.com/sembrestels/Tidypics

Conflicts:
	manifest.xml
	start.php
Added libraries.
Merge branch 'jquery-uploader' of git://github.com/sembrestels/Tidypics

Conflicts:
	start.php
	views/default/photos/css.php
Added missing upload library.
Finally uploaded missing file.
Settings are saving in lightpics plugin now.
Merge branch 'little-enhancements' of git://github.com/sembrestels/Tidypics
Drop files from desktop disabled (wasn't working).
Merge branch 'jquery-uploader' of git://github.com/sembrestels/Tidypics
Changed tidypics by lightpics settings.
Registered upload js library.
Removed useless jQuery stuff.
smash ol-express
fixed sending and manual notification
currently this is a working version with multiple templates passed in
Integracion de ReactiveUI
Added Campaign#update_ad_groups! (unfinished)
Added AdGroup#update (unfinished)
Added example: update_complete_campaign
Added example: update_complete_campaign
Refactored TextAd: attributes, initialize, create and find methods
Added example: delete_text_ad
[FIX] TextAd.update method
Added example: update_text_ad
[HOTFIX] symbolize_keys in Api#create and Api#update
Added updating ads to AdGroup#update, fixed updating core attributes
Added example: update_ad_group
Auto-deletion of missing subforms objects
liblcommon and liblsbl
Avoid adding tracks when searching

Avoid adding newly discovered tracks when searching, unless they
would be part of the search results anyway.
Added power and toughness to Card
update design
use jquery awesomeness
display :enter messages
Merge branch 'chat' of github.com:lunjure/lunjure into server

Conflicts:
	design
send time-string with commands
update design
add Java class "ConnnectionPoolUtil"
QDropboxFile::writeData(...) appends to buffer.

Check for ReadOnly and automatic flushing as well as QDropboxFile::flush()
are still missing.

Signed-off-by: lycis <daniel@deder.at>
- Add more to gitignore
Move default key-fn from CLJS to JS. Closes #1.
remove zone RRs with zone
Merge pull request #2 from tyzhnenko/remove-rrs-with-zone

remove zone RRs with zone
fixed coredump
pulling JCNBF
everything but color works
readme notes about psd
set non-fullscreen width to 1/2 the screen size or max at 640px.
micro-correzioni su accesso a DB (maiuscole corrette per non far impazzire MySQL), esportazione "Riassunto Prodotti", gestione ACL
Better documentation & error messages for the LineNumberAndPositionBufferedReader
Fixed RegexLexerGenerator bug where the start of a valid token which got cut off by an EOF would not be reported as unrecognized.

Now such characters are correctly converted into unrecognized tokens.
Profile picture on header
Updating author to makesites.org
added test for 50 and new state
bugfix, added model
Refactored a lot of facet related logic into each facet class Facet, RangeFacet, QueryFacet and DateFacet. Added support for RangeFacets.
Revert "recheck distance for delayed spells at hit v0.3, thx to raynar && carlos93. related to #873, need test. may require many CPU usage."

This reverts commit f0ad0188ad084feef392a882c88cb3e74b38d070.
recheck distance for delayed spells at hit v0.4, related to #873
Revert "implement LockedVector"

This reverts commit 0a5fab88d8e89916347b4ab8688ed2410d3c90ae.
implement LockedVector v0.2. some extend and VC compartibility.
[mr2507] fix DB structure after 2505.2
Revert "Revert "[mr2498] Remove wrong query on .pinfo command until those scenarios can be resolved:""

This reverts commit c49a8dd6a62f0ad57daface752902dd15381b370.
Implement ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_DAILY_QUEST_DAILY
Not blizz-like!
add again remove-short-arcs directive to fix issue #54, use the value 3 to avoid repeating issue #48
Added Phrase/Link methods
fix tile cache key
added Sparkle source to ignores
Fixed empty /:id pages
remove one reference to ToggleTree; still need to remove the TreeNode
reference
add a callback after workbench finishes loading.
Merge branch 'master' of github.com:maqetta/maqetta
Fixes #2814 - During major set of fixes for "states reconciliation",
I left out one bit of code, and that caused this bug. Also, along
the way, fixed a long-standing bug where switching states
inadvertently caused the selection to disappear. 
Merge branch 'master' of github.com:maqetta/maqetta
SmartInput for AUDIO: default data only spans half of the width of
SmartInput control (#2735)
Turn off ability to choose HTML in textarea smart input (#3116)
Merge branch 'master' of github.com:maqetta/maqetta into reviewBranch
Make zip quiet.
Fixes #2546 only removeWorkingCopy if model dirty
Added try/catch around parse() call
Merge branch 'master' of github.com:marakana/Stream
[feature/avatars] Fix coding guidelines infractions
[feature/avatars] fix 'user_avatar_type' in database updater

PHPBB3-10018
[feature/avatars] Add barebone gravatar driver

PHPBB3-10018
Avoid using Integer#/, as it is redefined by the 'mathn' stdlib
Inclusão de enum para a tela de parametros.
Testes com converter
Mudanca no relatorio
new key mapping for <escape>,

fixed NERDTreeToggle mapping
Fixed a bug where results where overwritten
Merge branch 'master' of https://github.com/marcocast/jgrep

Conflicts:
	src/main/java/org/jgrep/core/JGrep.java
	src/main/java/org/jgrep/core/task/GrepTask.java
Merge branch 'master' of https://github.com/marcocast/jgrep
move comment to correct place
cleanup for pull
missed
clean up and changes from testing
Initial checkin
Merge branch 'master' of https://github.com/markho/Anddemo3.git
removing site controller junk
groundwork for work add/edit
Pagos a String
Refactor en show de pagos
Refactor listado de pagos
Formato long en fechas
Mejoras en show de asistencias
Corrección link en pagos
Modificación usuario en asistencias
agragado lo de idSiguiente
metodo nuevo

agregada distancia entre 2 puntos en Geometria
metodos mas eficientes

gregorian calendar es mas eficiente
optimizacion

mejora el codigo del metodo calcularEdad
optimizacion

no creo un objeto gregorianCalendar, lo declaro todo en una linea
bug reparado
Fix a problem with SVG linebreaking where the lines would get farther and farther apart when there are multiple breaks within an equation.
Merge branch 'v2.1-latest' of https://github.com/dpvc/MathJax into v2.1-latest
login: Delete proxy support

Do we really need it?

Signed-off-by: mathslinux <riegamaths@gmail.com>
gui: Replace g_debug() with lwqq_log()

Signed-off-by: mathslinux <riegamaths@gmail.com>
buddytree: Fix code style

Signed-off-by: mathslinux <riegamaths@gmail.com>
login: Initialize errcode before login

Signed-off-by: mathslinux <riegamaths@gmail.com>
msg: Add missed include file

Signed-off-by: mathslinux <riegamaths@gmail.com>
chatwindow: Add chatwindow.{ch}

Signed-off-by: mathslinux <riegamaths@gmail.com>
info: Dont use s_malloc0 to create a buddy object

Use stanard API lwqq_buddy_new() to create it

Signed-off-by: mathslinux <riegamaths@gmail.com>
type: Add long_nick member

Signed-off-by: mathslinux <riegamaths@gmail.com>
main: Add lwqq_chat_window

lwqq_chat_window is a hash table whose content is chatwindow object

Signed-off-by: mathslinux <riegamaths@gmail.com>
mainpanel: Add buddy to mainpanel

Signed-off-by: mathslinux <riegamaths@gmail.com>
update installation docs. Mention context processor
Fragmentteja
menu ja spashfragment
gps toimii
fixed Encoder
Added image explaining lucene doc format and sample Json data
Finished implementing get_albums
Merge branch 'spotify' of github.com:mayhem/huesound into spotify
Implemented UIApplication setStatusBarHidden(boolean,boolean)
fixed bug in monoRename
merge records in type information update
Update index.html to use Twitter bootstrap
Reorder constructors to avoid errors
Developing Base Structure

Developing Base Structure
Add :unlisten SQL op
Added license info in README.
Use ruby 1.9.2-p290 in .rvmrc.
Merge branch 'master' into production
PROTON-85 : Fix python shim for Java for UUID in message-id/correlation-id

git-svn-id: https://svn.apache.org/repos/asf/qpid/proton/trunk@1401609 13f79535-47bb-0310-9956-ffa450edef68
added more type mappings

git-svn-id: https://svn.apache.org/repos/asf/qpid/proton/trunk@1401632 13f79535-47bb-0310-9956-ffa450edef68
updated README with note about root privileges

git-svn-id: https://svn.apache.org/repos/asf/qpid/proton/trunk@1401638 13f79535-47bb-0310-9956-ffa450edef68
release script updates

git-svn-id: https://svn.apache.org/repos/asf/qpid/proton/trunk@1401639 13f79535-47bb-0310-9956-ffa450edef68
added LICENSE files

git-svn-id: https://svn.apache.org/repos/asf/qpid/proton/trunk@1401689 13f79535-47bb-0310-9956-ffa450edef68
fixed detection of LIB_SUFFIX; fixed php configure to not break if PHPRC is set

git-svn-id: https://svn.apache.org/repos/asf/qpid/proton/trunk@1401718 13f79535-47bb-0310-9956-ffa450edef68
added quotes

git-svn-id: https://svn.apache.org/repos/asf/qpid/proton/trunk@1401725 13f79535-47bb-0310-9956-ffa450edef68
bump revision to v0.7 for next release
fix top-level html target
Noarch
moving core bsdiff logic out of main and into a new function bsdiff
adding implementation of err/errx for non-linux builds
changing bz2's u_char to uint8_t from <stdint.h>
removing requirement to seek inside of bsdiff

moving writing of header out of bsdiff and into calling function
removing dependency on FILE* based BZ2 functions
writecompress/finishcompress return bytes written instead of status codes now
tracking filelen and nuking dependency on ftell
splurging on 16 extra bytes to write the 3 off_t vars at once
removing dependency on FILE* based BZ2 functions
adding bsdiff_compressor and removing BZ2 dependency from bsdiff's core functionality
adding BSDIFF_LIBRARY define to exclude main and friends
replacing core usage of off_t (and sys/types.h) with int64_t
removing dependency on err.h
adding bsdiff_internal that takes a struct of args forwarded by bsdiff
moving core allocations to trampoline function so they're freed on error
adding const to old/new pointers coming into bsdiff
adding BSDIFF_HEADER_ONLY to compile out implementation
updating copyright string
removing unused bsdiff_write typedef
handling large file requests by breaking up calls to compressor->write
atualizado lalalala
asteristicocossss
center hero text
Add IlmBase dependencies for proper build order.
Added spec for per-product promotions
Working on per-product promotion stacking
added	example/example_build_from_cmdline.dart
new files:   bin/ccompile.dart, example/example_build_from_cmdline.dart
Added Keving to list of authors
Bumped to version 1.0.0
added command-t module
changed ruby settings
Added narrative documentation.
Added Hue line for range control
hacky rerender using ActionRegion
adding language to be included in transfer
started a functions file and moved some code to it
Removed for transfer to MIU
Update and Batch features supported...
1.增加列表事件
2.修正button change事件的派发时机
3.增加itemrender索引
4.为list增加选定
unset_pwm function added to cease running a given pwm
ppr revised, scheduled+admitted (merged)
phase 2 outdated
ppr_current:date fixed
confirm:tp search fixed
discharge inited
ppr+discharge init
共通の処理をGlacierToolsに切り出した
ArchiveControllerにした
Replaced ancient regexp-based hack with OrderedDictYAMLLoader
Added --metrics-notrack conntrack opt-out magic
Added --jinja2 and --jinja2-dump options
Minor bugfix
Bug fixes to AckP from Andres Vahter:
- with packet timestamping, acks need a whole message_t because the timestamp is written to the metadata
- if a message was held because an ack was being sent, the length field was not stored
Add parsing img tag

Signed-off-by: Kouhei Maeda <mkouhei@palmtb.net>
Add setup script firstly

Signed-off-by: Kouhei Maeda <mkouhei@palmtb.net>
updated Eigen dependency for Fuerte
ignore vim swp files
Updated LICENSE using the one generated through Bundler
Added useful default README content from Bundler