labofsahil/github-event-dataset-2012 huggingface dataset:
[#35352681] Add /Groups endpoints as defined in the SCIM spec.

Initial commit that adds GET, POST, PUT, DELETE endpoints for listing, creating, updating
and deleting groups. Access control based on readers and writers for each group,
apart from the general scim.read and scim.write based access for the endpoints.

Exhaustive test coverage, and synchronization with user accounts (updating user.groups
attribute when group membership is touched) coming soon.

When users are bootstrapped, they are automatically added to the respective groups. No support
yet for bootstrapping groups.

Change-Id: I6788c986c616e9e3a09ab31c08682c042554bde0
[#35952177] Add bootstrap support for groups and members.

Change-Id: Icf187568f362da5e604e70f9f0a22049ed44b385
Fixed gem unit test, failing since last week. Fixed jenkins too.

Change-Id: I691370a9b06f6803126d879966a8eaadd7955c1f
[#35953239] Add query filter support for /Groups endpoint.

With this change, both the /Users and /Groups endpoints support equivalent query filters.

Change-Id: If7582c32dba80cd8a740d2cde29463fa5850bb36
[#35953007] Sync ScimUser.groups field with group_membership table.

With this change, ScimUser.groups is a read-only field through the /User endpoints. During
read operations, this field is calculated dynamically based on the group_membership table.
The 'authorities' field in users table is no longer used (during read or write).

Group membership can be added or updated only through the /Group endpoints. Both user
delete and group delete trigger purging of the related membership records.

Change-Id: I2112c806a5bf1a1338a0d2f613d93e32cdbd0b67
Merge branch 'feature/groups' into develop

Conflicts:
	common/src/main/java/org/cloudfoundry/identity/uaa/scim/JdbcScimUserProvisioning.java
	gem/spec/integration_spec.rb

Change-Id: Iaa7b6d78f7665d3d5cab5545fafe05087b50741c
Update notes for submitted changes

* add port option to authcode and implicit commands
specs: fix with_random_app helper

Change-Id: I95db3bff8f0abff1475bdbf8c395a59a113bee2e
specs: allow providing 'given' inputs

Change-Id: I3653684ac6fd1619c9f9e5a19a3b4163dd18ba43
specs: #raises can test the exception with a block

Change-Id: I2c4d5257093f525fe8eeed23c952a02fef5a1659
fix strict dependency in gemspec

Change-Id: I9037965bca994f97aa45883e3564038a5f372c01
Update notes for submitted changes

* add create-service --version flag
Update notes for submitted changes

* implement service binding related v2 functionality
Fix up the project file.
/ ‘娴嬭瘯涓枃鍚嶅瓧鏂囦欢鍚?txt’
DefaultWebappMetricsFilter will get metrics factory from servlet context during init
Merge pull request #228 from jesseeichar/config-metrics-factory

DefaultWebappMetricsFilter will get metrics factory from servlet context
Remove description of dsl-pa library from .h files other than
dsl-pa.h.
Added Project Status section to README.html.
Added alphabet_eol class
Tweaks to README.h
More README.html edits
Added a dsl-pa-line-counter class as a start to doing line counting
in the reader class
Added more documentation and created a .cpp file for examples
Fix bug with Sender
Rolled version to 2012-05-14
fix
修复多端登录重复消息的bug
add thread pool and fix logger & ls command
fix
Release new ranking
Bug fixes:

Removed spurious debug statements (gh issue #1)
Changed operator[] to operator() because operator[] can only have 1
parameter. (gh issue #2)
Updated tests to reflect the change from operator[] to operator()
 Created gitingore
problem files
added apk take 2
Change the parent class for the projects mailer.
Heroku came in at the last moment to be a continent sponsor
Some cleanup and minor changes to 7929.

Put in some defensive code and cleaned some of the code up a bit.
add zh_thr_queue
enviando on errores
修改了博客名称，对应网址也要改变
Added the welcome controller for the home page
Switch to 100Hz "fake" sampling, for nicer-looking sample offsets.
Adding in p53 data
init some package
UPD adding a test to escape boolean data and to preserve boolean data
UPD adding code to pass tests for preserving boolean data
UPD adding test to ensure numeric data is preserved properly
UPD adding code to get tests passing
UPD adding test to ensure that numeric AND boolean data is preserved
UPD adding messages to assertions to debug problem
UPD adding code to preserve numeric and boolean data types
DEL removing erroneous test that is unneded and could potentially corrupt php.ini settings
array.lookup: allow for multidimensional lookup tables
Added YARD docs.

[ci skip]
added .gitignore to ignore objects and binaries.
Updated the CTS2 ecosystem image.
Hide the Info "I" button next to the service after the user logs in.
Merge remote-tracking branch 'choose_remote_name/master'
Use a HashSet instead of a TreeSet so mappables don't have to be Comparable
updated pkgsinfo/Apple/Rosetta/10.6/Rosetta-10.6.0.1.1.1249367152.plist --commited by MACaque @ 2012-05-10 16:13:41 -0400
updated pkgsinfo/common/Macaque-0.9.9.plist --commited by MACaque @ 2012-05-15 10:13:13 -0400
Added classes to represent objects in images, including bbox and segment
aggiunto esercizio 5
fixes #1799 providing test for REMOTE_ADDR check
fixes #1799 providing test for REMOTE_ADDR check
updated the cs theme, stop @darkmantiscs moaning :)
Game Engin

This is the game engin for our game
Adding missing supported() method back.
Enlaces a tops en cabecera y pie
Limite de 7 días en el contador de reportes para el primer gráfico de estadísticas
Cambio del mensaje en la creación del usuario
Added a missing require to Amounts-Mechanics
Added checks to Amount that report if a value is present
Added ability to fire superfluous events in Amount
Amount will fire its values immediately to an added listener
Added a missing includes to Callbacks-Frames
Callbacks.Script and friends support UI objects
Added Frames.KeepHidden, to force frames to hide
Fixed some bar texture names
UI-Bar returns an undoable on SetAmount, SetMonitor, et al
Added a couple more frames to UI-Bar's destructor
Fixed some bugs in CombatObjects-Damage and -Heal

We were reporting the damage from the combat log event as net damage,
but it's actually "real" damage; the combat log event includes overkill
damage.
Fixed a naming bug in CO-Target
Added some more fonts
Added support for StaticPopupDialogs, UnitName
Tweaked Frames.New to behave better when given insufficient args
Added Frames.Reparent, for reparenting a list of frames
Added modeline to SpellCount
Ensure Amount listeners don't fail if we dont have values
Added a couple TODOs in Frames
Frames.Color no longer touches backdrops at all
Added assets compilation on production.
added a call to curses.curs_set() to hide the cursor, which had been an ever-present grey
rectangle following the snake around the screen
rewrote the Ston packages from amber ... nuke monticello.meta directories and adjust the class properties to match Amber's class structure
ugh. Had to make changes to Series. lots of time for really no changes
- Refactor following site
Updated test_supervised_learning.py to reflect new mislabeling file format
Updating gem versions
Automatic commit of package [cartridge-jenkins-client-1.4] release [0.28.2-1].
Make setfacl(1) behave properly in situations like "setfacl -kd".

MFC after:	1 month
Make "setfacl -bd" an alias for "setfacl -k".  Previously it would crash
on assert.

PR:		bin/165807
MFC after:	1 month
In getfacl(1) manual page, mention where to read about the ACL syntax.
PR submitter suggested adding it to acl(3) instead, but I don't think
pointing ordinary users at section 3 is a good idea.

PR:		docs/162380
MFC after:	1 month
- Move jenkins.h to jenkins_hash.c
- Provide missing function that can do hashing of arbitrary sized buffer.
- Refetch lookup3.c and do only minimal edits to it, so that diff between
  our jenkins_hash.c and lookup3.c is minimal.
- Add declarations for jenkins_hash(), jenkins_hash32() to sys/hash.h.
- Document these functions in hash(9)

Obtained from:	http://burtleburtle.net/bob/c/lookup3.c
Add SPIDERV8-CHANGES.
Editor auto-update phase 2 ( detect->download->apply)

Incremental changes to the model to support a basic detect->download->apply user flow with some provisional UI bits to drive development and testing.

Notable changes include:

* more state in the update model (available revision)
* a preference to toggle auto download of available updates
* an update status control that monitors status and can drive manual download and apply  

NOTE: all of this functionality is hidden behind the experimental/enableUpdate flag.  Without this flag set, there are no user-affecting changes.
Review URL: https://chromiumcodereview.appspot.com//10213004

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge@6909 260f80e4-7a28-3924-810f-c04153c831b5
fix for fg_all color in zsh prompt
Put README back
Remove owl_variable_invoke_tostring

Now we only ever call it on the current value.
added tkf to contributors
Merge branch 'master' of https://github.com/tow/sunburnt
Escape forward slash characters in Solr strings for Solr 4+
Pretty impassable walls.
Reticule for placing elements.
Better reticule accuracy. no reticule on impassable.
Clicking places blocks.
updated to handle transitions better.
remove flake8 and bufexplorer
добавлено название главы
1.1.3   Added PlusRDev.mqh R console for debugging. There are several findings on the R variables regressand, regressors and pred.
Modified the block dropping code for better performance.
Fixed bugs in block dropping code of MemoryStore and changed synchronized HashMap to ConcurrentHashMap in BlockManager.
Fixed bug in BoundedMemoryCache.
Fixed more stuff in BoundedMemoryCache.
Added BlockRDD and a first-cut version of checkpoint() to RDD class.
Merge branch 'dev' of github.com:tdas/spark into dev
Updated the new checkpoint RDD to remember partitioning of the original RDD.
Made BlockManagerMaster no longer be a singleton.

Also cleaned up a few formatting things throughout block manager code.
Merge branch 'dev' of git://github.com/tdas/spark into dev
Merge branch 'block-manager-fix' into dev
Fix Akka configuration in assembly jar.

This resolves an issue where running Spark from
the assembly jar would cause a "No configuration
setting found for key 'akka.version'" exception.

This solution is from the Akka Team Blog:

http://letitcrash.com/post/21025950392/
Merge pull request #158 from JoshRosen/fix/assembly-akka-config

Merge Akka reference.conf files in sbt assembly task
Spark WebUI Implementation.
Compact job page.
Spark standalone mode cluster scripts.
Heavily inspired by Hadoop cluster scripts ;-)
Merging webui and dev branch
Merge branch 'clusterscripts' into dev
check in for integration
er
ww
ll
olo
ll
slidr
l
f
l
j
l
l
vendor compiled assets
production change
TEENAGENT: Align some variable names with coding conventions.
Move and document utility functions.
Update README.markdown

Added Applitude library module pattern example.
fixes runitu run
Add AJAX view to dismiss a notification.
Fix incorrect delete call. Add url pattern.
Replace alerts.js will simple dismiss functionality.
Merge pull request #29 from dimagi/dismiss-alerts

Dismiss Alerts
Sorting improved
Selecting improved
.gitignore added
gitignore updated
Only add cmsplugins to TinyMCE toolbar if absent

Allows TINYMCE_DEFAULT_CONFIG to define where on the UI's button-bar/s
the "cmsplugins" and "cmspluginsedit" tools should appear.
Merge pull request #1528 from Raumkraut/develop

Only add cmsplugins to TinyMCE toolbar if absent
report on failed download of source packages; fix site scripts
fixup xbuildtool/bin-link/
fixup xbuildtool/configure for working with git
test feature: send audio data with vdisp packet
Merge pull request #72 from dlvenable/master

MIME multipart updates
Fixing bugs in example
Merge pull request #74 from esromneb/master

fixing readme
Added common-js modules support for Views
Adding support for pluggable implementations of DesignDocument by making DesignDocumentFactory create all instances... this will allow implementations such as LuceneDesignDocument that support the fulltext attribute
Merge pull request #77 from seanadkinson/master

Change needed to support LuceneDesignDocument
Revert "Added common-js modules support for Views"

This reverts commit f1e0493bc275d07cbc54e5115e2f6e584b535d0e.
Opened up the View class of the DesignDocument
Fixed bug in includeRevisions. Parameters "revisions" is not a valid parameter. The real parameter is "revs" to describes all documents revisions.
Merge pull request #78 from devnied/patch-1

Fix bug in Options with includeRevisions.
Added the Assert back to the mapfunction
Merge pull request #76 from fireflyrox/master

Common-js modules support for Views
#29: Support Document Copy
Merge branch 'master' of git@github.com:helun/Ektorp.git
fixed api usage bug
explicit versions for misc maven plugins
#29: Support Document Copy
Added test case for view result which includes a deleted document. In the test 'doc_id6' is never returned because of the deleted 'doc_id5'. I have not yet been able to fix this issue as I'm not that familiar with the parsing code.
Merge pull request #80 from grove/ignore_deleted_document_bug

Added test case for view result which includes a deleted document.
fixed query result parsing with deleted rows in the result
If the filename is a directory, set it as default
Forgot to remove a printf
ST in progress; heading downstairs
Code's there, tests failing
Little better; but still puzzled
Fixed bunch of errors based on assert (UnsignedByte === Int).  Gotta figure out something for UnsignedByte that makes those errors harder to make.
ST instruction is done.
BROKEN added enable/disable feature for plugins
Added memory configuration logs.
Installing memcache in travis timeout. KIV'd
Adds support for serialize to work with a JSON string
Make sure things work even if we are using threads
Added linux binary and configuration file. It was compiled on a
Raspberry Pi, so it will not work on an Intel/AMD x86 processor.
video settings improved
this fixes DAA instruction
When a video finishes it now scrolls to the next section
Fixed merge conflictttt
adding cc_partition to templates

Change-Id: I45c6aa9eeb922bbb169c211b74b29c7268c87285
Merge branch 'side-by-side-poc' into ccng-side-by-side

Change-Id: I16221a169f1c3688bf7e8cd22d460ab81e9ea5f7
update hm_next src, ccng src, and ccng job

Change-Id: I45c6aa9eeb922bbb169c211b74b29c7268c87285
Revert "Revert "Creating 2 jobs that contain various hadoop, hbase and opentsdb components.""

This reverts commit 38aab176a2882ef0d00ec6adbaf49c3b3e17d04e.

Change-Id: Ic33beb1d6e6c975f1611be0897a8dddcdfe89f95
forward router traffic to report_processor

Change of Patch Set 2:
1 update code based on Pieter's comments.
2 change router_ctl to always call setup_trafficlog_forwarder.sh,
  so when we remove report_processor node from system, old forward
  content in /etc/rsyslog.d/10-trafficlog_forwarder.conf can be replaced
  by empty content.

Change-Id: I1ad293e71a8ec06c3b56d65f925f8fa5765abcdd
Signed-off-by: Henry Chen <hchen@rbcon.com>
Bump tests pointer

git shortlog 02abed3d..41d9b860
Alex Suraci (1):
      fix vmc dependency version

Dave Syer (1):
      CFID-389: fix uaa-tests in yeti to register client with valid scopes

Jennifer Hickey (2):
      Test support for modular Sinatra apps
      Test Rails autoconfig with Ruby 1.8

Pieter Noordhuis (1):
      Retry when retrieving crashes

michael zhang (7):
      merge service_quota cases to master
      enhancement of max_clients quota of mysql
      increase quota tolerance rate
      constant solution for ruby 1.9.3
      support service_plan by env vars
      add acl cases
      upgrade cfoundry to 0.3.27

Change-Id: Ic794dd84643331c7decc5d3cc02d5f05e441d757
Release 100

Change-Id: I42f2ebfc1ed205a0a66622917455c4c13331cd28
Merge branch 'built'
Updated manifest for Micro Cloud Foundry 1.3.

Change-Id: I161c0d0fdedfcb8e9ac87fbff2cab38f9bc9b895
Merge "Bump tests pointer"
don't include ccng .git directory in ccng package

Change-Id: Ice1e9460e140bf8d3c69d7fc1b1b1d1cc95406dd
Merge "Updated manifest for Micro Cloud Foundry 1.3."
Improve process for adding runtimes and frameworks: DEA

- Remove runtime info from DEA config

- Fix runtimes.yml indentation

- Match runtimes.yml LD_LIBRARY_PATHs to DEA config

- Bump DEA pointer
git shortlog 48960e6a..431b79c7
Anfernee Gui (1):
      Raise the level of some logs to warning

Jennifer Hickey (1):
      Improve process for adding runtimes and frameworks

Change-Id: I58fac2afc121bd5c6aa7312c9ebb8285859d5e60
Merge "don't include ccng .git directory in ccng package"
Merge "Revert "Revert "Creating 2 jobs that contain various hadoop, hbase and opentsdb components."""
Merge "forward router traffic to report_processor"
CFID-403: Add login server job and configure it to talk to UAA

Change-Id: I7d19441b3c6034cd153d183bb25efb39ec19a850
C) Move swift defaults for config & data

* change config vars _LOCATION to _DIR to be consistient with other vars
* let config files live in /etc/swift like they want to
* move swift backing files to $DEST/data/swift

Change-Id: Idbd507736b46c5c2330e0255cc87f40068d3faf6
Merge branch 'glance-conf' into dt-test
Merge branch 'swift-conf' into dt-test
Merge branch 'unstack' into dt-test
Merge branch 'stable/essex-repo' into dt-test
Fix issues when working through an outbound proxy

* openstackclient had unrecorded dependencies
* move setup.py invocation to a function to set proxy variables
* use keystone to get admin token (eliminate a direct curl invocation)
* check for cached image files of 0 bytes and re-download if needed
* rework setup_develop() to work with proxies

Change-Id: Ief356667ed3ef8d05c6604f12513ae81f68cec04
Merge branch 'proxy-fixes' into dt-test
Added a customized pie chart
Rebuild and fixed a namespace conflit during the charts move as a dependencies
JavaScript Log--, NaCl renders, polishing

- oz
  * citer() and iter() overloads for containers
  * Log: NaCl port doesn't send JavaScript messages any more
    (pp::Module::Get()->IsMainThread() hung up)
- ui
  * Area::uiWidth & co. removed, UI always uses physical resolution
- client
  * more lazy loading, at most one model per update
  * System::width and System::height put in use also for other platforms
Resizable window

- oz
  * String::parseLong()
- ui
  * Area: repositioning, CENTRE
  * UI creates all UI windows instead of proxies
  * several UI bugs fixed
- client
  * resizable window
  * auto-update for game data on NaCl
halloween
tidy and integrate
fix startrek css
Sapporo planning, maybe. :v:
Track planning here. :v:
Submissions preferences cookies name
Columns fix
now have git on windows
Fixing busted tests
Updated visuals behaviour and added new sounds
new screen visuals. added in projection mapping capability (copy from main project)
completed SearchHiddenSingles method
Merged r9911 from trunk to 1.4-stable (#11328)

Fix Japanese mistranslation for 'label_language_based'.

Contributed by Go MAEDA.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9918 e93f8b46-1217-0410-a6f0-8f06a7374b81
add rspec_rails
Merge pull request #1 from apache13/master

add rspec rails
List view: Pass node list as JSON
Rename data vars to node and node_extended
Don't load nodes twice for list view
Merge pull request #61 from edelight/fix-list-view-node-data

List view: Pass node list as JSON
added git branch helper functions
converted roch map to correct fen string
added a option to moveTo method.
Fix action menu bug.
Displaying day in week as Mon 9/26
Week offset in place and events displayed in Day columns
Special event array constructed to deal with full day events
Renamed event_getter methods to make more sense
Merge pull request #75 from egelmex/master

missing files
Batch of changes to add timeouts, bold living people stuff and some
other neat features that got lost in the Great Git git of 2012.
Adding missed files (day/night tasks)
adding some alternate messages
Merge branch 'master' of https://github.com/tpcarlson/Werewolf

Conflicts:
	src/no/arcticdrakefox/wolfbot/management/GameCore.java
Merge branch 'master' of https://github.com/tpcarlson/Werewolf
Trying other layouts
changed class name to avoid conflicts with bootstrap
camera distance 30000
SymbolRow: Implement the symbol inversion mechanism
SymbolRow: Implement the symbol underline mechanism
Font: Fix pixels of the symbol with code 0
Add the RequestSender class
Implement the RequestSender class
ProtocolPlanar: Start request sending in loop
RequestSender: Add the KillThread method
RequestSender: Implement the SendRequestLoop method
RequestSender: Add tick on each send iteration
Add the TickKeeper class
RequestSender: Set tick value in the TickKeeper singleton
SymbolRow: Blink according the tick state
move responsibility for lazy setup into computed.js entirely instead of guarding setup outside
the newest chrome use "domContentLoadedEventStart" and "domContentLoadedEventEnd" instead of "comContentLoaded"
Inseriti alcuni valori di campo da esempio mondadori
Migliorata la diagnostica
fix doctype for IE standards mode, specify charset early so browser can render faster
Merge branch 'master' of github.com:enyojs/bootplate
lexical scopinng for let expressions is broken. use dynamic scoping for now.
Cleanup code using li3 specs
initial push, structure of project
hex formatting
Removed redundant io:format calls.
Added context information to graph and a pexec stub, storing context Ids is not yet necessary.
move "Episodes" menu entry below "Posts"

fixes #20
Work on OCSP: added a complete client and configuration code. Not yet
wired up together.
Remove navigation title
Save search history into plist
Bugfix and remove dup record
Show subject cover
Merge pull request #6 from Sunight/master

Save search history into plist
added ssh tunneling script for pair programming through remote host
added shortcuts for $ and -> in php files
Update post: IT-LP-Physics
Remove github ribbon from index.html
The modification of ApiInterface constants' names
fix keeping tagbar open at all times
adds the website
607168
Bitarray index first draft
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

Conflicts:
	arangod/BitIndexes/bitarray.c
	arangod/RestServer/ArangoServer.cpp
	configure
whitespace etc. to reduce diff size
some cleanup to reduce diff size
some cleanup to reduce diff size
Merge branch 'master' of github.com:fceller/ArangoDB into devel

Conflicts:
	lib/HttpServer/HttpHandler.cpp
trying to upload bitarrays
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
still trying to get this code up to github (maybe one day)
working, but still blocking batch processing implementation
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
added some error messages when using --pid-file
some cleanup
issue #116: fixed description of createCollection option
fixed doxygen errors
fixed some things in the batch handler
some cleanup
not necessary anymore
added example for --supervisor option
Some fixes for bitarray indexes
fixing model structure and adding active record library
Ported `rbenv-vars` stuff to `env-it`.

- Running `_` will show current env vars set.
- Running `_ CMD` will start the command settings env vars.
- Env files are now cleaned. You can only set ENV vars.
Created folders for laboratories. Downloaded clones of Tine 2.0 for starting adapters for MongoDB and Cassandra.
Split out processing data and analysing to reduce reprocessing
Removed dynamic registering form Parser
travail rapport
Merge branch 'master' of https://github.com/fishfinger/cfpsd
Add the Studio to the main solution
Fixed oversight in last commit
ajout de toto
Question plugin answers to the user, question mark optionnal
Use .empty?
Merge pull request #7 from florentsolt/master

Joke plugin & remove todo
Merge pull request #8 from BenoitZugmeyer/master

Question plugin answers to the user, question mark optionnal
Nsfw all the way
Ruby 1.8.7 compat
Erk
Add team command
added airos/corebundle to composer
Implemented GL.Attributes
ignore .project file
pvr: removed displayed channel logo on right side and add channel name
instead (fullscreeninfobar)
Merge pull request #384 from xhaggi/pvr

pvr: improvements for the pvr section
pvr: modern + classic video osd buttons for live tv
pvr: add 50% fading to modern button icons in video osd
Merge pull request #385 from xhaggi/pvr

pvr: modern + classic video osd buttons for live tv
pvr: guide osd improved
...
Merge remote-tracking branch 'origin/master'
Fix plotoutline everywhere
---
Merge git://github.com/BigNoid/Aeon-Nox
Season fanart naming convention
Merge pull request #386 from xhaggi/pvr

pvr: guide osd improved
wip
fixed: positioning of label on volume bar
Merge pull request #387 from xhaggi/pvr

fixed: positioning of label on volume bar
pvr: adjust font size
Merge pull request #388 from xhaggi/pvr

pvr: adjust font size
pvr: using variable FontColorVar instead of hardcoded font color
exported env var to '.zshenv'
fixed: "focus" doesn't bubble, see #241
Merge pull request #247 from aglemann/selectmenu

fixed: "focus" doesn't bubble, see #241
some basic docs
replace logo with png
fix for variable displacement
Merge branch 'master' into production
Merge branch 'vars'
Declaration that was mistakenly removed during rebase merging
Remove duplicate definitions and move definition (fixes bugs introduced during rebase merging)
Remove duplicate files
Remove duplicates of files in cxx-generator
 * Remove unused function jsval_to_CCPoint (note the Case)
 * Declare extern "C" when compiling with C++
Remove unnecessary header
Sync with jsb::ScriptingCore
Tighten up access specifiers and organize class header
Use jsbScriptingCore.h for the parent class jsb::ScriptingCore
Android makefile
Use namespace cocos2d
Constructor declaration, getInstance() method and access specifiers
Fix typos and constructor definition
Add cocos2d-specific utility functions as private methods
runScript is virtual, js_log is not declared in cocos2d::ScriptingCore
Add jsval_to_ccarray_of_CCPoint to cocojs manual conversions
Use static method from ScriptingCore
Fix cocos2d::ScriptingCore's use of protected member variables from jsb::ScriptingCore
Move cocos specific JS functions
Remove runScript re-definition in base class
Minor comment update
Re-arranging methods for readability (no functional changes) and marking file local functions as static
Use CCLOG
gcc code generator tests
merged remote
Removing disk stats tracking.

Can't really differentiate between disk and in-memory reading, so scuttling
this for now.
General Help; [img] tag for MathContent
[games-puzzle/limbo]: a puzzle platform video game (wine)

[
  I have made a ebuild for game Limbo, the ebuild takes wine as a RDEPEND.

  This ebuild is more advanced than PlayOnLinux:
  1. Installed by root, used by everyone
  2. Automatically download installer exe file from www.limbogame.org
  3. Directly extract and install files, no installation wizard
  4. Can use LANG,LC_ALL to select language on the fly
  5. Installs desktop icon, seamlessly integrites with Desktop Environment

  This ebuild also has some disadvantages:
  1. depends on wine, and wine has regression sometimes
  2. I think it's legal, but I can't be sure
]
modificaction du regex
rm classpath and application.properties
adds rspec and capybara
Using OpenLayers.Console if window.console is unavailable.
Merge pull request #319 from ahocevar/console-fix

Using OpenLayers.Console if window.console is unavailable.
Edits to tile related improvements.
fix typo in notes/2.12.md
Fixing test.
Merge remote branch 'upstream/master' into 2.12
Merge remote branch 'ahocevar/320' into 2.12
Add missing requires directive for OpenLayers.Format.WMSGetFeatureInfo.
Cosmetic typo fix thanks @probins.
create new OpenLayers.Geometry.Polygon.fromBounds function
don't use deprecated OpenLayers.Bounds::toGeometry
change deprecated comment from jsdoc to Natural Docs
add @requires for OpenLayers.Geometry.Polygon.fromBounds
Removed call to `save_and_open_page` accidentally left in feature.
Start on second draft
Split box::stretch to box::stretch_absolute and box::stretch_relative

Also included tests and documentation.
Fix setting IPv6 default configuration option.
Fix issue with setting subelements values with default langs.
Add support for XEP-0186: Invisible Command
Add support for XEP-0221: Data Forms Media Element
Bump version to 1.1.7
Merge branch 'master' into develop
Fix requesting channel binding from sockets that don't support it.
Music video now playing info. Identify now playing using type.
Fix a typo (I guess?) - sb!win32 does not designate a package. Change it to sb-win32 and it works!
Merge pull request #22 from lueo/master

Fix a bug on win32
SGU 190 Dominoes
SGU 141 Jumping Joe
I have lv but don't have nkf
CRM-9948 obsolete in 4.2 fix cases to show on dash
started working on a "bug"
fixes some problems
updated readme
[maven-release-plugin] prepare release degen-1.1.3
Ignore .classpath and .settings
Back to 100% image size
Fix comment typo.
Refill the path and url caches in the item model at the end of this task.  Fixes #1896.
[#1928 - Make thumbnail generation more flexible for movies (graphics and movie helpers)]
- graphics helper: add movie_extract_frame event to generate function
(allows modules to add to the options sent to movie::extract_frame or to
generate the thumbnail on their own without movie::extract_frame)
- movie helper: add extra optional argument to movie::extract_frame
(can add ffmpeg arguments and/or change the frame extract time)
- gallery_installer: add movie_extract_time module variable, update to v53
- module.info: update to v53
- install.sql: update to v53
Merge pull request #81 from shadlaws/master

[#1928 - Make thumbnail generation more flexible for movies (graphics and movie helpers)]
Fix up test_lib.sh to make the smoketests work on Ubuntu 12.04
Merge branch 'master' into hadoop-os-build
Pull in smoketests for DNS and NTP
Merge branch 'master' into hadoop-os-build
First pass at adding support for barclamp.supercedes support.
Merge branch 'feature/crowbar-yml-provides/master' into feature/crowbar-yml-provides/hadoop-os-build
Add support for barclamps to supercede eachother.

For now, this support is pretty limited -- it allows for exactly one
supercede per barclamp, and there is no versioning or other
conditionalization support built-in.
Merge branch 'feature/crowbar-yml-provides/master' into feature/crowbar-yml-provides/hadoop-os-build
Merge pull request #212 from VictorLowther/feature/crowbar-yml-provides/master

Add barclamp.supercedes support to the build system. [1/3]
Merge pull request #214 from VictorLowther/feature/crowbar-yml-provides/hadoop-os-build

Add barclamp.supercedes support to the build system. [3/3]
Merge branch 'master' into hadoop-os-build
Import fixups from master
Merge pull request #216 from VictorLowther/feature/crowbar-yml-provides/hadoop-os-build

Fix up broken branch merges left by rebasing for barclamp.supercedes. [2/2]
Merge branch 'master' into hadoop-os-build
Merge remote-tracking branch 'origin/hadoop-os-build' into hadoop-os-build
Teach dev about the cloudera-os-build branch
Merge branch 'master' into hadoop-os-build
Merge remote-tracking branch 'dell/hadoop-os-build' into hadoop-os-build
Update barclamp dependency checkin to not die too early.
Merge branch 'master' into hadoop-os-build
entities added and some gameloop logic and vector class
merged results of gameloop
finalizing API for project resource
Deleted useless Program.cs
Updated animation system
Bug fix-Invalid datatype
Features to list
Refactoring ScriptTransport to allow the function closure to be more easily garbage collected.
Setting the X-Requested-With header when calling Request#open().
Starting on specs for http.ScriptTransport.
Add fisa colorscheme
Add kate colorscheme
Add ninja syntax
Add octave syntax
Update vimrc
Use NULL with pointer types
Handle genders case insensitively.
update readme cont. iii
add maven dependency information
Remove page header section from dashboard (as its entirely useless)
Clarify owner vs admin in the UI
add Plugin Gundo
Several code warnings fixed.
Upload avatar. First step
nginx-1.2.3-RELEASE
Put infobar on top of all other elements
Update WIP extension feature
Add pause step
Check data-swordfish-disabled on parent elements
Prevent inception
Merge pull request #5 from gkellogg/master

Update base IRI of terms document in html-dcmiterms.xsl.
Moving old XSL scripts and headers for RDF schemas back into header and xsl directories.
Deleting archive copies.
Merge branch 'master' of https://github.com/dublincore/website
Add previous version of build.xml as build.xml-pre for ready reference.
sync with moinmoin SyntaxReference
film ratings
Display missing extension warning at the top of the panel.

Do check even if configuration isn't done.
This is the first stab at bringing namebench kicking and screaming into Python 3.
allow saving figure when there is no x-server
okay, maybe that is offensive
emit route starts
largely working
Guided convergence full report: better, neater, correcter
bash: avoid wrapping branch in prompt
Store the GameMode from the event and added break statements to the switch

Signed-off-by: Darsstar <darsstar@gmail.com>
Merge pull request #315 from Darsstar/gamemode

Store the GameMode from the event and added break statements to the swit...
Hunger / Exhaustion / Food properties re-implemented. Axed the Gamemode components.

Signed-off-by: William Lebel <lebelwilliam@gmail.com>
Partially fixed VANILLA-70. The minecarts don't fall underground now but still move all alone on tracks.

Signed-off-by: William Lebel <lebelwilliam@gmail.com>
Modified Flags
new view for view all anime, + sorting on id
GRMustacheSectionElement documentation
GRMustacheSectionElement code cleanup
Documentation
RELEASE_NOTES.md wording
Swap Typhoeus for Net::HTTP

Typhoeus doesn't appear thread-safe, cropping up with the occasional "error
on thread select" exception.
Extract Net::HTTP into separate DynamoDB::Request object

The Request class is responsible for crafting the signed HTTP request and
returning a response. It also raises the proper DynamoDB exception if the
request is unsuccessful.
Convert security token service to use Net::HTTP
Remove Typhoeus dependency and bump version in gemspec
Support timeout on requests
Merge pull request #1 from groupme/net-http

Swap in Net::HTTP instead of Typheous
Update appvm-crash-20121121.txt
finished homework 5, JSPs, Model1
removed unnecessary comments!
rebuilt manual pdf and ps files
Flag tests as pending
файнал проверка мерджа
- logout width
+ add details table sorter
change /scenes/sort to put method
Implemented ocean depths via water distance layer.

Added 2D smoothing layer.
Added 3D form terrain basic layer.
Merge branch 'master' of github.com:hach-que/Tychaia

Conflicts:
	Tychaia.ProceduralGeneration/Tychaia.ProceduralGeneration.csproj
	TychaiaWorldGenViewer/FlowForm.Designer.cs
	TychaiaWorldGenViewer/FlowForm.cs
Added replace layers and fixed code.
Merge branch 'master' of github.com:hach-que/Tychaia
Add support for denominator exceptions. Handle HQMF that doesn't include one or more of the expected population criteria types (e.g. measures that only define an initial patient population.
Merge remote-tracking branch 'ph/develop' into develop
Gemfile 1st version: including sinatra and rdiscount(markdown)
change default gem source to taobao
add gemfile.lock to ignore list
set layout and custom index page in "route.rb". Add layout and default
index page in /views
add a Procfile for Cedar(heroku)
Update lib/osgb_wgs84.rb
Aliases containing non-word characters have issues
Removed function __quote; used printf '%q' instead
Release latest in function twh-android-release
Claimed phone numbers are not unique.
Hide support for broken phone number verification.
May 26
Merge pull request #11 from sevenaces/master

May 26
Changed name of compiled binary to qtbc
Merge branch 'master' of github.com:hazybluedot/qtbc
Buggy jump implimented
Merge branch 'master' of https://github.com/helloplz/Gravity

Conflicts:
	Platformer/src/com/gravity/player/Player.java
Fixed off-by-one error in terrainCollision.
Made spikes background transparent.
Fixes issue with Play3 and line-in that caused Play3 not to display
on GUI.
move to mie
folder entries are now displayed at the top
added function GetFileMagic
embedded stfs packages open when clicked on
Merge branch 'master' of github.com:hetelek/Velocity
removed redundant my declaration
removed couchdb dependency and replaced with servicestack
when_sending_binary_data_as_multipart_post now uses servicestack too.
Initializing the apphost in one baseclass now. Hadi will be happy.
deleted init and teardown and moved dataspecificationbase to helpers folder.
Changed the readme file.
Merge pull request #12 from chrissie1/master

Removed couchdb and youtrack testing dependencies. Now runs with self-hosted ServiceStack
Fixed dependency for support node v0.8
Checking in changes prior to tagging of version 0.1.13.

Changelog diff is:

diff --git a/History.md b/History.md
index fcb4273..f483a6a 100755
--- a/History.md
+++ b/History.md
@@ -1,5 +1,10 @@
+0.1.13 / 2012-06-26
+===================
+
+  * Change dependency module version for node v0.8 support
+
 0.1.12 / 2012-06-17
-==================
+===================

   * Change package name
Add components module
Add destroy function using external lxc-destroy
Remove trash functions from roadmap, not really needed since archive does the same
Version 0.2 release
[HW] Add make system

Signed-off-by: Angel Hitov <angelhitov@gmail.com>
[HW] Import SIP footprints

Signed-off-by: Angel Hitov <angelhitov@gmail.com>
Added attachment detail form.
css for button hover
updated S12G-Mini-EVB port
switched to common clock driver
Had the error message displaying on the wrong field for validation rule
of patient not committed reason
removed the corpus directory
removed corpus/ and run directories
Another wrong function call fixed for bug #7310.
Changed the version to alpha14
Support DPC regs, and block out DPS regs
Added csslint notes
Implement getH
bbhood's vimrc form spf13-vim, thx steve and spf13-vim.
first step and waiting ...
fix issue with secure connections and keep-alive
Merge branch 'master' of github.com:hydna/node-hydna
Sun Oct 14 08:09:36 EDT 2012
Full Greeter project
Merge branch 'master' of ssh://git@github.com/iThompson/School.git
Fit for sdk4.6
Rename parseUnitString to extractUnit and beef it up
Added note for Victor
Added another note for Victor
update tanks
properly validating add boulder form
Merge pull request #10 from iff/form-validation

properly validating add boulder form
修改readme。
修改readme
修改readme，加入编译流程示例
- Added .gitignore file to prevent bin files and others from being added to the repository.
Merge pull request #1 from RoryBecker/Test

 - Added .gitignore file to prevent bin files and others from being adde...
ESEntitySync update
api: compatibility with net.js
0.0.6
refactor {Horizontal,Vertical}BarChart view to BarChart
- add counts to legends
- add sub-title
- add measurement-axis label
- auto-wrap group label text
- optionally show percentages or totals
- display chart groups in alphabetical order

centralize data-action handler in action_events.js
- updates handler to only handle destroy actions (the only action currently)
- adds confirmation dialog

miscellaneous fixes & updates
- trigger remove
- unset metric map if it's new
- improve display of below threshold warning
- improve dimensions calcs & scales
add measurement_axis_label to reports
spare travis ftm
Alpha2 - table revamp
GUI: add method with which can turn on or off state "hover"
First commit of the future exclusive REclusion
add root_zshrc
Change ArrayLists to hold Strings instead of Players
Fix for #2093.
Retrieve the displayName rather the address part of the email address
Merge branch 'master' of github.com:inverse-inc/sogo
Add date to ChangeLog
Added to CalendarRepositoryFunctionalTest.
created args class to wrap up recursive traversal and transformations, rewriting type inference
Merge branch 'master' of github.com:iskandr/parakeet
Fix navigation buttons issue
add scss mixins and code to paper effects component page
added path url options for s3
Added a few changes to the code
use mvim instead of open for edit
removed unused or excess variables
template_js: oops
Install erlang on ubuntu
Updated from aws
Bump version to 0.10
Rename 'echo' function in Citadel.pm to 'citadel_echo'.
Rename 'echo' function call in t/01citadel.t to 'citadel_echo'.
Add an explicit 'return' line to the citadel_echo function.
Rewrite citadel_echo POD documentation (RT#71743).
Net::Citadel::ToDo as of 23 September 2012.
Changes for version v0.10
Net::Citadel v0.10

* develop:
  Changes for version v0.10
  Net::Citadel::ToDo as of 23 September 2012.
  Rewrite citadel_echo POD documentation (RT#71743).
  Add an explicit 'return' line to the citadel_echo function.
  Rename 'echo' function call in t/01citadel.t to 'citadel_echo'.
  Rename 'echo' function in Citadel.pm to 'citadel_echo'.
  Bump version to 0.10
wip
Refactor DOM to include node-specific types with overridden behavior, implement a few node types related to Select/Option
Finish refactor
Merge pull request #29 from jamietre/select

Select
Revision to string comparer for RangeSortedDictionary
script now looks for *.maxref.png image files rather than *.png files
clenup of spurious files
pl-Script.R is the script file for running various tests using the pfSIR commands
plSIR-plot contains the plotting commands related to CIs from the particle filters
updated Table of contents
Week 3 Mieaningful Commit
update code samples to use => instead of -> for lambdas
refactored jason's commit
Timer is now in Common
Zip iterators. Optimisation level is now configurable
Minor corrections
- ‘docs/’
- ‘docs/Presentation2.pptx’
adding barbs size to vector plot
[AS7-5253] clear transformers registry
[AS7-5132] increase connection timeouts
acquire ControllerLock in the restart-required handler
AS7-1263, add the deployment descriptor schemas and DTDs in docs/schema and use a local resource to validate xsd files.
[AS7-5269] HornetQ interceptors are not supported

* set HornetQ remoting interceptors on HornetQ configuration
  before adding the server
* the subsystem expects the interceptors to be put into a
  JBoss Module that depends on org.hornetq:main and is added as
  a dependency of org.jboss.as.messaging:main
[AS7-1271] ObjectMessage ClassLoader isolation

* add a test to check that a ObjectMessage with a custom serializable
  can properly be produced from a WAR and consumed by a MDB (provided
  the EAR is built appropriately)
[AS7-4109] Allow expressions in system properties
Remote Naming 1.0.3.CR2
JBTM-1151 camelcase
CRUD de Porte implementado
Update youtube regex to make https links work.
save changes because of laptop breakdown
wizard for creating custom alphabets complete
implementing custom alphabets combo in classic algorithms
support for custom alphabet creation in classic algorithm wizards
Merge branch 'master' of git@github.com:jcryptool/crypto.git
Sudoku update
Merge remote-tracking branch 'origin/master'
Re-added Fiat Shamir and Feige Fiat Shamir plug-ins

Signed-off-by: Dominik Schadow <dominikschadow@googlemail.com>
Re-added DPA plug-in

Signed-off-by: Dominik Schadow <dominikschadow@googlemail.com>
Merge branch 'master' of git@github.com:jcryptool/crypto.git
Updated to 0.9.8

Updated version information to 0.9.8 for next release

Signed-off-by: Dominik Schadow <dominikschadow@googlemail.com>
Deleted unused image files

Deleted the files that aren't being used to save some space.

Singed-off-by: Jerome Sevilla <jds@programmer.net>
removed os x specific line in bootstrap
new uart driver
Merge branch 'uart', remote branch 'paparazzi/master'
Merge remote branch 'paparazzi/master' into uart

Conflicts:
	conf/autopilot/rotorcraft.makefile
update cam files from Chris Efstathiou
define CAM_[PAN|TILT]_[MIN|MAX] if not already defined
Merge branch 'master' into cam
Merge branch 'master' into cam
extended digital_cam module: shoot at angular interval on circles, shoot at linear interval on straight lines
Merge branch 'master' of https://github.com/AxSt/paparazzi into cam
cleanup whitespaces
automatically use dc routines is DIGITAL_CAM is defined (the module digital_cam module loaded)
add prototype for dc_info
Merge branch 'master' into cam
Merge branch 'master' into cam
added the digital_cam module (to control the shutter) to the cam_example airframe
use extra navigation routines in cam_example
Merge remote branch 'paparazzi/master' into uart

Conflicts:
	conf/autopilot/rotorcraft.makefile
	sw/airborne/mcu_periph/uart.h
fix endline
new uart driver parted for stm32, still working with lpc, needs to be
tested on stm32
fix buffer -> buf
compensate for hostname only config update
testing new fork on laptop
Update AnaliseCombinatoria
Import git version 1.0.2
Import yum version 1.0.0
Import dmg version 1.0.0
Import build-essential version 1.2.0
Import runit version 0.15.0
simple git cookbook
.profile for /etc/profile.d
Change tx_rx tty grep to RaspberryPi attached Arduino
Improved installation and running documentation
Whitespace trimming.
More whitespace trimming.
Wrapper around (require 'cl).
Wrapper around (require 'cl).
v3.1, support for internal events
Test hook
Merge branch 'syntax' of git@github.com:jhclark/ducttape into syntax
Add support for Eon EN25F64.

Its ID was spotted in an ICH descriptor region update by Jetway:
http://paste.flashrom.org/view.php?id=1217 and is used on ASUS P8B75-V
boards according to some forum posts (2 chips per board actually).

No datasheet was found, so most values are just guessed from the EN25F32.

Signed-off-by: Stefan Tauner <stefan.tauner@student.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner@student.tuwien.ac.at>

git-svn-id: svn://flashrom.org/flashrom/trunk@1594 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Remove exit calls from sp_sync_read_timeout and sp_synchronize.

Add return values to sp_synchronize so we can signal a failure to the
only upstream caller (serprog_init), which is prepared to propagate a failure.

sp_sync_read_timeout was harder to fix because it already used a return
value, but we needed to distinguish two different failure modes. This
solution distinguishes them by the sign of the return values, which maintains
readability as much as possible.

Thanks to Niklas Söderlund for the original patch and idea.

Signed-off-by: Niklas Söderlund <niso@kth.se>
Signed-off-by: Stefan Tauner <stefan.tauner@student.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner@student.tuwien.ac.at>

git-svn-id: svn://flashrom.org/flashrom/trunk@1595 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Add untested board enable for ASUS P5LD2-VM.

Based on http://patchwork.coreboot.org/patch/2881/ but with 
the right pin (i.e. 16) according to Joshua Roys.

Signed-off-by: Idwer Vollering <vidwer@gmail.com>
Signed-off-by: Stefan Tauner <stefan.tauner@student.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner@student.tuwien.ac.at>

git-svn-id: svn://flashrom.org/flashrom/trunk@1596 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
finish writing unit 8
Update the customer form
Merge branch 'add-tagging' of git://github.com/eldarion/geonode into haystack-search

Conflicts:
	shared/requirements.txt
	src/GeoNodePy/geonode/maps/models.py
	src/GeoNodePy/geonode/settings.py
Updated README with info to OXID Version 4.6 and removed typo
removing local OSX files
removing local OSX files
Add suspend
No rdio
Start of chosen plugin
Start multi calendar view
Adiciona notificações
Widget on HoneComb
Hide feedback text when search returns nothing.
0.7 /proc/pid/{comm,cmdline} handling improved
Merge branch 'master' of git://github.com/christospappas/streama

Conflicts:
	Gemfile
	Gemfile.lock
	README.rdoc
	VERSION
	lib/streama/activity.rb
	lib/streama/actor.rb
	lib/streama/definition.rb
	lib/streama/definition_dsl.rb
	spec/lib/activity_spec.rb
	spec/lib/actor_spec.rb
	spec/lib/definition_spec.rb
	spec/support/models/activity.rb
	streama.gemspec
Merge branch 'master' of git://github.com/christospappas/streama

Conflicts:
	README.rdoc
	VERSION
	lib/streama/activity.rb
	lib/streama/actor.rb
	lib/streama/definition.rb
	lib/streama/definition_dsl.rb
	spec/lib/activity_spec.rb
	spec/lib/actor_spec.rb
	spec/lib/definition_dsl_spec.rb
	spec/lib/definition_spec.rb
	spec/support/models/activity.rb
Comment out publish instance method that is not supported in our branch of streama.
Update version
More merge commits
Added examples parsers and more C test cases.
Setting up SPARQL tests on VEGA.
Fixed #490 StudyView::Data can not sort on measurement moment
Added documentation for the weight field.
Maps some key bindings for copy and paste in tmux
Added argument size checking
Fixed a bug in dependency postprocessor with processing throw command