labofsahil/github-event-dataset-2012 huggingface dataset:
fix makefile: create var/include if it doesn't exist
update
	modified:   application/helpers/app_helper.php
	modified:   application/libraries/Adminverify.php
	modified:   application/libraries/Level.php
	modified:   application/models/link_model.php
	modified:   application/models/user_model.php
	modified:   application/modules/admin/link/controllers/common.php
	modified:   application/modules/admin/sidebar/views/index.php
	deleted:    application/modules/admin/sidebar/views/index.php~
	deleted:    application/modules/admin/user/controllers/common.php~
	modified:   application/modules/admin/user/views/form.php
	deleted:    application/modules/admin/user/views/form.php~
	deleted:    application/modules/admin/user/views/list.php~
	application/modules/admin/setting/
Admin area page view

- Adds pages model
- Admin index action gets pages and sets them in view
- View displays pages (very basically at moment)
retour a la premiere version
Improve pointcuts
Improve system property retrieval in EvalCallback
Improve 'dacapo' script
fixing improvement
UPDATED SUBMODULE: git@github.com:paulreimer/ofxWebUI-web.git in data/web, fixed minification by using ui-deps.min.js before ui.proto.js, and ui.min.js after
We should use blockquote tags instead of q with display block
Merge pull request #84 from paulrouget/q-vs-blockquote

We should use blockquote tags instead of q with display block
Utilize mersenne-twister random number generator
Implement killing on server
Test killing
Implement dying on client
Do not trigger start when there is only one player left
Display player_left_game event in chat
moving bootstrap-datepicker
adding tmp fix for checking if survey can be taken
[Paizo] Pathfinder RPG: Ultimate Combat

Work in progress

Issue#: NEWSOURCE-130


git-svn-id: https://pcgen.svn.sourceforge.net/svnroot/pcgen/Trunk/content/notfordistribution@17016 b6a209e6-650d-0410-972b-dadffa731f64
Fix bug: Companion - No CompMod Is being applied.
* Include new characters in global PC list
Issue#: CODE-1462


git-svn-id: https://pcgen.svn.sourceforge.net/svnroot/pcgen/Trunk/pcgen@16790 b6a209e6-650d-0410-972b-dadffa731f64
Task #1 resolve variables with VariableContext
Add support to operations to replace values
Merge branch 'feature/fix-variables' into develop
Delete old object files
Update the overo objects
only remove all listeners from current stream instead of killing it again
arclength. not easy
Readded some text, and corrected grammar.
Move PluggableOptionParser to optionprovider.py
Windows: Add NetworkCheck support
Code clean-up, replace AttributeError. Refs #1021
Papylib: remove long message split code, as papyon take care of this now
e3: Remove old msn backend as it's unused and broken
Fix extra_args format
Merge branch 'hotfix/qos'
minor fixes
removed erroneous file
Merge pull request #82 from percyfal/hotfix/handle_multiple_sample_ids

Add code for dealing with aliases
Merge pull request #87 from b97pla/master

bugfix
Merge remote branch 'scilifelab/master'
Merge milestone and issue calls into labels listing.
Add live feature tests for labels api.
Update Business Plans/src/bp_analytics.py

Added tasks re aggregate durations
Class Restricao renamed to Constraint.
Super awesome
heroku specific happyness
Moved code out of mock subdir so this repo is a valid npm package
Fixed deprecation message in tests.

Also build tests against android-15 (like the main app).
Show bottom border of the toolbox in "Tabs on Bottom" mode, for the vertical tab bar
Added get/set alpha to View
Merge branch 'master' of https://github.com/pivotal/robolectric
Keep track of which providers a listener is bound to in LocationManager
Merge branch 'master' of github.com:pivotal/robolectric
added a few new buildings and gave buildings names
order xhtml checkpoit commit
Fixed an issue with wx IDLE event on Linux.

The debugger was blocking debugging wx on Linux as IDLE events are only
generated after another event (which is different from Windows and Mac in
this aspect). Added a timer to about created mainloop in a timely manner.
Fixed serialization of usedata values that don't provide tostring().
Updated rockspecs to point to a particular tag.
Fixed an issue with returning stack values with circular references.

Upgraded Serpent to v0.18 for the fix.
Added reporting errors in deserializing stack data.
Removed Moai-specific breakpoint logic as it turned out to be unnecessary.
Added conversion of file names on windows to lower case.

This is needed because some users may have folders in different
capitalizations between the file system and their spelling in
package.path. For example, if there is a folder 'foo', but in
the code it is referenced as package.path = [[c:\FOO\?.lua]], Lua still
loads the file bar.lua from folder 'foo' successfully (as the Windows
treats 'FOO' and 'foo' names as being the same). However, it will
then report in the debugger the name as c:\FOO\bar.lua (as specified
in package.path, even though the "real" name in the file system is
C:\foo\bar.lua. This mismatch creates problems with breakpoints in the
debugger, so to avoid it the file names are converted to lower case (on
Windows only).
Performance improvements (thanks to Stephen Nichols for profiling and providing detailed suggestions).

The most effect should be felt when the debugging was started using
start() call and proceeded without stepping through the code at least once
(in_debugger function continued to be called in this case, which was not
necessary). Removed creating and throwing away temporary tables in
select() call as this was causing noticeable slowdown in tests.
Improved path matching when absolute and relative paths are used.

The path used in breakpoints is always as short as possible with basedir
being removed from it if possible. This makes a difference when an
application is started with a full name (lua /full/path.lua) in the folder
'/full', but then loads another file from the same folder, which will have
a relative name in the debugger. In this case, the basedir (/full in this
case) will be removed from the absolute path, allowing breakpoints to
work.
[build] Add the missing Timer desktop file

closes #206 - Adds the missing desktop file  to that make install and
the clock works again
Merge pull request #3 from siraj/issue_206

[build] Add the missing Timer desktop file
Merge pull request #4 from pocon/ScorerDev

Scorer dev
Fixed newline bug caused by newline bug fix
Added input exemption
Bug fix
Fixed the biggest derp in history
Merge pull request #16 from peterarenot/patch-1

Added input and raw_input character ignoration.
Tweaks for Menu Add Page option, one last tweak left
More wp_object_cache checks for #497
Fixed comparison operator in where clause always set to default.
Fixed BETWEEN and NOT BETWEEN operators in Pods->find() where clause.
Fixed indentation style.
Fixed typo: strtotime() should be strtoupper().
Merge pull request #917 from MattiasBuelens/2.1.x

Fixed comparison operators always set to default and fixed BETWEEN and NOT BETWEEN.
pods-385 Manage -> Delete on item edit page does not work.

Also only show the delete action if we have an id and show a confirm box before deleting to prevent miss-clicks.
Adding pusherTest
Merge branch 'master' of https://github.com/poindexterc/Plumx24
Ch6 exercises complete
handle powers of two themselves in Mathematics.nextPow2()
do nothing if input is a power of 2
Merge branch 'master' of github.com:polygonal/polygonal
biasing
support optional argument for configuration file
Merge remote branch 'origin/master' into ssl
make SSL work behind a proxy

in nginx set `proxy_set_header X_Forwarded_Proto $scheme;`
add secure upload as well
Always maximize email and the browser.
Add Alt+Shift+Return to center a window, for laptop keyboards.
Relicense under ISC

This is why I pretend these old repositories don't exist.
why did I even these?
Player loads up
Add acceptance setup support for RPM-based systems

This supports running the acceptance tests against the development yum
repo on neptune.
Merge pull request #230 from nicklewis/support-rpm-tests

Add acceptance setup support for RPM-based systems
Correct Vendor reference of Git Library
Fix a typo in the RPM
noscript config
cron update at Tue Jun 12 18:35:01 EDT 2012
Added different namespace
iii
Merge branch 'master' of git@github.com:qaziimran/thirdrepo.git
final commit
gfx-empty. 1px emptiness.

Signed-off-by: David Peitler <qqroach@riftworks.org>
buttscript lexer, main program and utilities, parser not yet
PUT method can have content too
Suite de la question 1.
MDL-37017 My Moodle: Course name should be fullname of course
Finalizado todo
Terminado
Finalizado todo
tinyurlapi hinzugefügt
Added trove classifiers.
Update README.md
Update README.md
Update README.md
global variable detection
remove debug print
Improve readability
change list insert to list append to gain efficiency
bug fix for reading history
PAHMA-469: Refactor merge field computation to account for fields being in different schemas.
NOJIRA: Dynamically set currently selected menu to class active
CLC-737 - Fix some of the layout issues in mvp
Merge pull request #285 from christianv/CLC-737

CLC-737 - Fix some of the layout issues in mvp
Merge pull request #284 from shacker/wip

NOJIRA: Dynamically set currently selected menu to class active
[CLC-506] Gemfile updates, rspec config fixes, database settings updates, rake tasks, and default rails_config overrides
Merge pull request #277 from yuhunglin/CLC-506

[CLC-506] Gemfile updates, rspec config fixes, database settings updates, rake tasks and rails_config overrides
Removed stray README line from last merge
CLC-727 Correct token format; use Faraday for http
CLC-727 Remove unneeded requires
CLC-727 Make sakai proxy return the remote server status code
CLC-727 Handle remote server error gracefully
Merge pull request #283 from ctweney/clc-727

CLC-727 Correct token format; use Faraday for http
CLC-526 MyClassesApi model on Canvas proxy
Fixed sleep bug in fork
Merge branch 'master' of https://github.com/raywainman/ece421p2
ContentIndex & ContentProcessor Improvements

Added HasFrontMatter member to ContentBase.
ContentIndex now ignores files and directories that start with a dot
(period).
ContentProcessor now creates/deletes the destination directory and
copies files that do not need processing.
Update src/main/resources/oauth.properties

remove keys
Testing out italics for the subtitle.
Readme and code. Not very well tested, but it works for everything I've needed it for so far.
Bug Fix : Cannot reply comment from Admin Panel
Fix slug duplicate error and cache delete error
Update installer/reborn/config/config.php
Updated manifest. Removed komodoproject junk
Improved USAGE section of README
Net/AMQP/Haiku/Properties.pm:

* added def_queue_purge_properties()
Makefile.PL:

* Added Try::Tiny
* Removed Test::Exception, as it is only for testing purposes
t/test_basic_publish.t:

* Changed delete() to delete_queue()
* Added test for purge_queue()
Net/AMQP/Haiku.pm:

* Changed delete() to delete_queue()
* Added purge_queue()
* Added consumer_tag and num_messages in the test configuration
* Added test for equality of consumer_tag
Net/AMQP/Haiku.pm:

* Changed consume() to consume_queue()
* Added consume() as a synonym to nom()
* halt_consumption() reset consumer tag to default value on success
clean code and tests
MIT-LICENSE.txt added
Fix usage of INVALID-SYNTAX condition, Relative mode assembly. Update docs.
pop up error on invalid/missing week preset
show preset name in could-not-load message for auto.week label
add color to preset labels to indicate which preset got loaded
more coherent still sucks
app tests and cleanup
php-horde-Horde-Mime: add patch for php 5.5
store challenges in a DB table
Version 1.1.0 finalized
Add basic styling, flash messages, and updated specs
Merge remote-tracking branch 'phiggins/custom_slugs_should_be_unique'
uniqueness was merged to globalize3 master
404 on unknown dialog instead of rendering a blank iframe.
Moved view method Page#title_with_meta into the view.

New Helpers:
* page_title_with_translations(page)
* page_meta_information(page)

These helpers apply to the Refinery backend when conventionally invoked.

Conflicts:

	changelog.md
	pages/app/models/refinery/page.rb
Refactored code from Dialogs#show into utility methods.
Fixed some whitespace and unrequired parentheses.
Add specs for page_meta_information and page_title_with_translations helper methods.
Provide a utility helper view_context#sanitize_hash

Primary use case: to sanitize Pages#preview input.
Add specs for sanitize_hash helper.
Move changelog entry about #1847 to 2.0.6 section.

Conflicts:

	changelog.md
Merge remote-tracking branch 'origin/cherry_picks_from_master' into 2-0-stable
Add missing word in changelog.
Add note to changelog about #1719.
Update identifier when session is refreshed.

When a user's identifier has changed (in other words their browser has
updated or their IP has changed), update the identifier stored in the
session when session is refreshed because otherwise the basic session
protection will mark the session non-fresh on the next page load.
Add test for session refresh + identity change + basic protection.

Test reauth gives access to pages using fresh_login_required even when
user's browser has updated (i.e. User-Agent has changed).
Added a test for comparison of UserMixin objects.
Added __eq__ and __ne__ methods to UserMixin.
Merge pull request #33 from joelverhagen/master

Added __eq__ and __ne__ methods to UserMixin.
Merge pull request #32 from FelixLoether/master

Update identifier on confirm_login
Merge remote-tracking branch 'upstream/master' into hexdigest

Conflicts:
	tests/login.py
initial local workable
Close #20 - Attributes refactoring

See issue #20 for details.
Iteration #26: Unlimited number of images per proposal implemented.
debug

subida del debug de futboleoNet
resto de ficheros
compilation fixes after renaming
added castle core references
Moved some util code to nurupo
Add topoview layers to existing project
Install style templates
dbmanager: delete auto-generated files
Merge pull request #281 from strk/db_manager_addlayer

dbmananger topoviewer: addlayer instead of creating a new project
refresh the canvas at the end of the process,
handle unicode strings,
escape sql ids and strings,
fix minor errors
Set QGIS WFS Server GML valid
WFST implementation
Inserting all the features in the Insert element
Correct loop inserting all the features in the Insert element
Finalizing Transaction
Add comment in the Transaction method
Add namespace
Add fromGML2 and exportToGML2 to QgsGeometry class
Little mistake correction
Better Insert and Geometry creation with WFS PRovider imporve
Cleaning WFS Provider and add precision to geometry export
Merged Bug #6485
Merged Bug #6485
Added logout and styled login/logged_in/out pages. Cookies now have an expiry (to become configurable)
Increased block size in fetcher
added project3 slides
comitando um projeto para o servidor para o chat do ConversATOA
att..
update recentSearches component tests
clean-up the start/stop script for nginx
Added mongodb, php_mongo packages, reworked build_mysql due to some
build issues on 64bit systems, clean-up some typo's, upgraded some pkg's
versions.
upgrade codenarc
mainframe, application: fixed merge conflicts from previous rebase
购物车的问题
fixed forgotten change in custom program: ls->cp
Fixed ajax-loaded users privileges pages
add comandos ao aux do cucumber
Settings for redis
foo
Merge pull request #2 from rogopag/New-Structure-to-Task-Code

New structure to task code
Update to 391
Update to 795
edit old style
增加從 raw data 產生 json 的 parser
Incluindo contato e consertando chamada de fotos para o slideshow
Revert "Trimmed the branch to only the rqt_plot sub directory"

This reverts commit aeb554e8a6839b6a29d5c953ede2d4a9febd6f3a.
Rebase from 'upstream' @ version '0.2.4'
Trimmed the branch to only the rqt_plot sub directory
Remove packages:
 * whoopsie - no idea what this has to be installed for and run on a server
 * landscape-common - best bug ever when under high load you cannot login anymore because this breaks

Install htop :) (it's useful and pretty)
WorkerPortlet.java: modified addWorker to inject userId, groupId and
companyId from Liferay user. 
View.jsp: testing liferay-ui search container to show database data.
Add rumblelabs holidays ftw
Endret ppt etter gjennomgang med Kjetil
finishing up statement name analysis.  Fixed error where idNodes of declarations were linked to Sym entry in SymTab.
Select the new buffer

When calling `dispass-list-labels' the new buffer should be selected,
not _just_ shown.
fixed minor issue in compute cloud example
Fixed SIGNUP-185 issue: list possible organisers in alphabetical order

git-svn-id: https://source.sakaiproject.org/contrib/signup/trunk@81998 fdecad78-55fc-0310-b1b2-d7d25cf747c9
update the trunk pom.xml version from 2.9.0-a02 to 2.9.0

git-svn-id: https://source.sakaiproject.org/contrib/signup/trunk@82001 fdecad78-55fc-0310-b1b2-d7d25cf747c9
Add in WL refresh cap by nhede and requested by aurora dev.
FAQ style tweak
Modified comment-view creation. Modified activities link colour.
Fixed count issue where read counts updates were not unique for feed values
Manually counting can now use offsets in case of broken feeds.
python2/3: Harden against other pythons. Pip 1.2

- Unset PYTHONPATH and PYTHONHOME which would lead to
  install distribute and pip into the wrong python.
- For NCLT: Add to CPPFLAGS the path to zlib via -I
  because python's setup.py scans only these flags.
- '-Qunused-arguments' can be added after
  ENV.enable_warnings to reduce noise. The only thing
  which we must not add is the "-w" switch!
- For python.rb only: Pass "--no-user-cfg" to python
  setup.py and add --force when installing distribute
  and pip to ensure overwriting with the new ones.
wxmac: add path to Python.h for Xcode only install

- Added --inclue-dirs to python build_ext
- Remove the caveat about the need for --framework python. It's actually not needed any more.
Reformat complete code with new code format settings.
Update README.md
Update README.md
Fix Issue #100: GridFS: Not able to select Add Files, Drop Bucket and Statistics option for a selected Grid Bucket.
Issue #87:- UI Enhancements - Navigation bar
Issue #104: Query Executor is not hidden on clicking server stats.
Merge pull request #106 from srinathanantha/master

Enhancements & Bug Fixes
Enhancement #113: Option should be provided for the user to rename the Collection Name
Enhancement #114: Option should be provided for the user to convert Collection to Capped Collection and vice versa
Merge pull request #120 from srinathanantha/master

Enhancements : Support for Renaming & Converting to capped collection & vice versa
Merge branch 'master' of https://github.com/Imaginea/mViewer

Conflicts:
	src/main/webapp/js/collectionOperations.js
	src/main/webapp/js/documentOperations.js
	src/main/webapp/js/fileOperations.js
	src/main/webapp/js/headerOperations.js
	src/main/webapp/js/navigator.js
	src/main/webapp/js/submitDialog.js
	src/main/webapp/js/systemCollectionOperations.js
	src/main/webapp/js/uploadDialog.js
Adding new store basic get and proc scripts
Adding new tomasdomingo proc script
You know why t-rex can't clap his hands? - Because he's dead.
added primefactor class and problem 3
Breakout Indigo and Juno weaving plugin versions.
Add zsh spec
add box-shadow to popup, matching iOS behavior
widen popup elements, matching iOS
Changed installer location and modified installer script
switch endpoint now modifies effective user with actual user db content
initial font glyphs
Blocking http://userscripts.org/scripts/show/92054 for using a 3rd party updater
Don't allow install on XP to stave off ugly crashes.
added search form to error page
added meta noindex for search page
updated gitignore
Fix NERDTree window jumping
Added \text to list of things concealed
Removed thread stuff from inital-data.yml
Removed thread stuff from inital-data.yml...all the way, this time
Fixed issue where first created category would not show up until after a refresh.
Fixed typo someone made calling for .js file.
path completo del main.php
added a bit of a user login / register seciton. Not entirely finished as register doesnt actually write anythign to DB. need ot add the HttpPOst for register.
embedly
embedly key
Merge branch 'master' of https://github.com/denisw/buddycloud-http-client
scroll rest notifier
gitignore
removed c9r
scroll works
added assets from the old project

We can use all the css and convert the html files to underscore
templates.
css file for displaying
html files
fixes for indo and us east request
fixed for Refused status
modules/partdisks/front: added some bits of the glade frontend.
modules/raspberrypi: added
config/: added semplice-raspberrypi configuration.
setup.py: ship raspberrypi config and module.
Something great is happening ;-)

- Services support (Modules which runs on threads)
- New glade frontend (gtk3, every module has its own glade file)
- Glade service (preloads the glade files and shows the gtk3 window)
- Other minor things
modules/userhost: added and completed glade frontend.
linstaller.py: if module is preseeded, add _preexecuted to its seeds
linstaller.py: "casper" return status: it returns the old module's return status
frontends/glade: implemented steps, some more signals
services/glade: added header.
services/glade: change_entry_status() which changes an entry's secondary icon with icons that matches the header.

other things that I forgot...
modules/mirrorselect: added glade frontend.
modules/welcome: glade: added the "how to use this application" section
frontends/glade and services/glade (and core/): support on_caspered signal.
modules/: made the glade frontends less crashy and faster
Moved README to README.md
Updated README.md
modules/partdisks/front: added some bits of the glade frontend.
modules/raspberrypi: added
config/: added semplice-raspberrypi configuration.
setup.py: ship raspberrypi config and module.
Merge branch 'master' into debian-pulse
2.14.0.
2.14.0: added new .install files.
fixed connection drained out bug and few minor bugs. connection pooling reset
不要ファイル削除
リファクタリング:ファイル名変更
ファイル名の変更に伴う、旧ファイル削除
improved parsing of stream, and using coroutines for the extractor filters
Worked on uploading Photos for Galleries
New image for bombs
Added missing objects to gcc build
Remove formulae moved to Homebrew-science

Closes #16143.
Update manpage. Fixes #16206.
RabbitMQ 3.0

Extract and install rabbitmqadmin from the management plugin at install
time (since we also enable the management plugin by default)

Closes #16207.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Sonar 3.3.2

Closes #16208.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Merge remote-tracking branch 'upstream/master'
Added Radar window
Added WebView to Radar window
- 去除domain filter
+ 补全dnsfake的数据
* 修正dnsserver获得数据的bug
* 增加了一些调试代码，调试socks服务，例如danted。
[IMP] Разобрался с коллизиями.
add a plugin to translate.
Merge pull request #1 from shiftkey/alexanderbeletsky-master

Test issues resolved
bugfix - Title setting overwritten by page Title
파티 css 최종
reflected Scott's comments
Adding a simple collision routine to the engine.

Nothing uses this yet, but I think it will be useful.
add bin/h264encode
Update idhfiles.MD5

During the import from p4 we fixed whitespace issues. This causes the
checksum for the idh files to be different even though they didn't
change otherwise.

Change-Id: I606912fa54409d281457afcc9b69f799165bc3d4
Updating plugins, adding shell.
Обновлены файлы кнопок уровней
plumb in uids
Added Info button to pack purchase row.
0.7e - revert ext4 and fifo and workqueue tweak
renaming site.pp: deleting first
renaming site.pp: adding as templating.pp
Updating CMake modules. Adding several new additions
massive refactor on libcommon. Cleaning things up, moving code around,
updating tests and integrating new code
minor updates that were not collected
clean up
initial attempt at simplex noise
apparently i made rot13 at some point
merging cmake differences
added hint text.
Project v0.8.3

added the dtl.segment back into the query to get the user effects, now
that this has appeared in the nutcrackertable.sql structure and was used
to update the local database.
add asteroids
add wargame files
reconnect wargame modules
Added logic to allow JSON field names in the URL query string
Added entptr to strtoull call
Minor rename done simplifying usage of renamed classes.

git-svn-id: https://asio-samples.svn.sourceforge.net/svnroot/asio-samples/trunk@759 b0109a4c-6076-47d0-973a-9f9728c2f665
Added test for URL w/o schema.
Move extern declarations to header files
Use default box for metrics view input fields

Default box is closer in style to labels used with them, so that they
theme consistently.
Rename _GGadget_gtextfield_box and make it local

It is no longer used outside gdraw/gtextfield.c, so remove the extern
declaration and rename it like other local variables.
Unused flag
Refacor link drawing code
Make _GGadget_button_box local
Simplify
Glyph Info → Counters look better this way
Document X resources changes
Remove gwwiconv option from configure.
Clean out AC_CHECK_HEADERS and include fallbacks instead.
conf
Merge branch 'master' of github.com:soundstep/test_repo
- move icons
practice11_1
License headers for xml files

Signed-off-by: SciencyGuy <jonas@kalderstam.se>
Merge branch 'master' of github.com:spacecowboy/NotePad
Widget improvements

Signed-off-by: SciencyGuy <jonas@kalderstam.se>
Indentation and null check

Signed-off-by: SciencyGuy <jonas@kalderstam.se>
Set due date in list to zero height if not there so checkbox is centered. fixes #57

Signed-off-by: SciencyGuy <jonas@kalderstam.se>
just nicer use of booleans

Signed-off-by: SciencyGuy <jonas@kalderstam.se>
spelling and such

Signed-off-by: SciencyGuy <jonas@kalderstam.se>
altered java servlet to use a static string for now
added python to path
select_distances: select all states with state=0
wp7 initial app
login and signup pages
Made multiline test cases work on windows too
cleaned master to add new files later
sync version
Partial fix for bug 61743 to get correct icacls path
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Partial fix for bug 61743 to get correct icacls path
Fix bug #61800 ext\standard\tests\streams\bug61371.phpt fails
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug #61800 ext\standard\tests\streams\bug61371.phpt fails
Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails

Conflicts:
	ext/sqlite3/tests/sqlite3_15_open_error.phpt
Fix bug 61786 Failing tests in ext\session\tests\*
Fix bug 61685 putenv('TZ=UTC') doesn't update timezone for localtime()
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug 61685 putenv('TZ=UTC') doesn't update timezone for localtime()
Fix test for proc_nice: bsd ps command didn't support option -o "%p %n"
- Added missing bound check in iptcparse() (path by chris at chiappa.net)
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - Added missing bound check in iptcparse() (path by chris at chiappa.net)
- Fixed bug #61827 (incorrect \e processing on Windows) patch by: ab@php.net
- BFN
- BFN
Fixed bug #61546 (functions related to current script failed when chdir() in cli sapi).
Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4

* origin/PHP-5.3:
  Fixed bug #61546 (functions related to current script failed when chdir() in cli sapi).
  - BFN

Conflicts:
	sapi/cli/php_cli.c
Merge branch 'fix-pro_nice-test' of https://github.com/reeze/php-src into PHP-5.3
Revert "Merge branch 'fix-pro_nice-test' of https://github.com/reeze/php-src into PHP-5.3"

After pushed, I found the test script in 5.4 is already fixed this, so
revert this change, and be consistent with 5.4's test

This reverts commit 24d85e4bd8d56197ca673791ad007f2e595478cf, reversing
changes made to bae56a87f81b91cd815604b0f404f616b0d73c2b.
Add Left/Right Power Support

 Add Left/Right Power Balance for FIT and Polar HRM parsers
 Add Left/Right Balance metric
 Add Left/Right series to Ride Chart

Fixes #711.
Initial Version

Node Monitor module has two components. WebServices and Backend server.
This is the initial version of Node Monitor.
Merge https://github.com/srikap/cloudmonitor
Supports RFC 6455
Update notes for submitted changes

* This is to fix bug 1079827. Please work.
Fixed issue with the example where the inequality constraints went the wrong way.
Fixed a spelling error.
+ ‘requirements/Points_Ratings_and_Reviews/PRD-Reviews in communities-1.0.docx’
[enh] make htun depend on htstun, so only htun needs to be started
Improve README (fix)
use Resque.redis as default redis connection
added a consumer class

pairing with @tenderlove and @therealadam
adding a poll method to Queue

pairing with @tenderlove and @therealadam
Consumers can be paused

pairing with @tenderlove and @therealadam
use a latch to pause and resume our consumer

pairing with @tenderlove and @therealadam
unsuck our tests

pairing with @tenderlove and @therealadam
* global pop timeout
* ThreadedPool
* add connection factory

pairing with @tenderlove and @therealadam
default create_connection to Resque.server

pairing with @tenderlove and @therealadam
Merge branch 'master' into consumers
remove test::unit
don't special case on Redis::Namespace.

We should not have conditionals based on whether or not we're using
Redis::Namespace.  Always treat the connection like a normal connection
(Redis::Namespace should be transparent).
removing whitespace errors
Merge pull request #645 from tenderlove/consumers

Treat redis connection consistently
update redis-namespace dep to 1.2.0+

we need this so blpop strips off the namespace keys for when its
returned back to Resque.
prevent spurious wakeups on JRuby
use latches in the consumer test to avoid live lock
Merge remote-tracking branch 'tenderlove/consumers' into consumers
fix test
use a pipe for testing read/write blocking
always abort for tests
libbsd: delete cruft from PKGBUILD
coreutils: merge dc, dd, expr, hash, mktemp, sbase, sed, test, tr, xargs
+ ‘default/wallnext.conf’
grammar hard
make explosions brighter


git-svn-id: https://gritengine.svn.sourceforge.net/svnroot/gritengine@2209 3c9ba142-2be6-4198-8de6-d73c80d60e27
Fix 0.5 texel issue in d3d


git-svn-id: https://gritengine.svn.sourceforge.net/svnroot/gritengine@2210 3c9ba142-2be6-4198-8de6-d73c80d60e27
Fixes #6 - added Empty and NotEmpty alternatives to nil
6.txt is not add
Comments shizzle.
定理の順番を入れ替えた。
punching through drupal5
项目新文件
添加kCardSize等宏定义、定义back函数
添加setCard函数
添加项目新资源
项目新文件
修改UI
实现GameEngineDelegate
添加录音接口
解决冲突
修改cards属性为strong
完善录音流程
修改initView函数
修改UI
修改initView函数
添加SystemSound枚举定义
新声音资源
添加新资源
Merge remote-tracking branch 'upstream/master'
修改initView函数
连接IBOutlet
split org
add popup-ruler
[#404] first part of rewriting editor creation
Included config if puppetdb is used.
bug in variable.
forgot to include new files in last commit
added config for cron.pp
added configs to [master]
added conditional configs for foreman and puppetdb
Added firewall option
Update files to remove trailing spaces
Fix Char/HChar mixups and constness in m_initimg.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13102 a5019735-40e9-0310-863c-91ae7b9d1cf9
bootcamps: Add latlng metadata to several bootcamps

I don't have any personal connection to these boot camps, so I mostly
used the location of the hosting university.  Some of these boot camps
actually list addresses (e.g. 2013-01-CAMH) or link to pages that do
(e.g. 2013-02-amos), and I used that location to get more accurate
coordinates where possible.
Merge pull request #165 from wking/bootcamp-latlng

bootcamps: Add latlng metadata to several bootcamps
moved file export UI from cron to event based, added entry_updated field for determining regenerate file, uses socketio to stream background task, and added new views and js
[Update] ZD #4440
starting to clarify tabs code
improved code organization
Fixed r29 register class
Increase autocomplete limit to 10
Homepage wording
Upgrade pymongo
Rollback pymongo
Bug fix
Cache baguette friends
Bugfix
Better caching
Testfälle getOverallPrice
Testfälle ergänzt. Recognizes entfernt. Wird in dem neuen Projekt nicht
benötigt.
dired-mode
uniquify buffer
start to fix after conversion to CoffeeScript
Bug in afronden van prijzen opgelost
Submodules are puzzling to me.
add others config files
Whitespace cleanup
Use an actual form for easier JavaScript access
More selectors for JavaScript
added twipPort to n9
Added heroku and pg gems.
Merge branch 'master' of github.com:teoulas/api-bakeoff

Conflicts:
	Gemfile.lock
contact_id hardcoded somewhere else
Handling Tropo sms callbacks.
Merge branch 'master' of github.com:zekus/api-bakeoff
Merge branch 'master' of github.com:pl/api-bakeoff
Fixed package information
Fix localization with fallback mechanism copied from kangaderoo/fpdb-kangaderoo
Fix localization with fallback mechanism copied from kangaderoo/fpdb-kangaderoo
set the graph size to 8 inches by 10 inches so it will fit on a
sheet of A10 paper when printed

throughout I want sparkler to do the "right thing for 99%" of cases
generate 8x10 inch graph image at 300dpi

these are standard settings for printing
update tests to reflect new image size and resolution
oops, move labeled graph generation outside of the for loop
update tests again since the checksums changed when moving graph generation out of the for loop
add functionality for filtering the y-axis labels
so that we don't wind up with so many that
you can't read them
evenly space the y-axis labels when there are more than 50,
rather than spamming the y-axis with labels that overlap
add section: users, clubs, players
add section: competition
Initial load
Merge branch 'master' of github.com:thanatosJSSE/LibQtx
Add cache clearing functions
think I fixed what's going on with the unauthenticated nicks in users.db
added debug stuff to ircUserDB
added table3
added table number to osc messages
Cause leaves to show.
Add spec for delete_relationship
Extract CypherResponseParser
WIP Neo4j::Cypher
add range checks to from_str_radix functions
⇱ link marking
Revert "Só para teste."

This reverts commit 2cde9abeb6f22a4d53bd76fce157393cd2da2555.
hook/cd: Initialize _cd certainly.
Merge branch 'stlcomparator' into filestream

Conflicts:
	test/unit/CMakeLists.txt
	tpie/internal_sort.h
	tpie/sort.h
support multiple conditions in if, while, assert - for #170
fix test
Fix for ceylon/ceylon-compiler#767: make ModuleManager.createModule take a version arg

That helps the backend a lot dealing with JDK modules
initial impl of !is conditions
always narrow to intersection in is condition (even when defining vars)
fix #413
initial implementation of "alias" declarations #406
Merge branch 'conditionlist' of https://github.com/ceylon/ceylon-spec

Conflicts:
	Ceylon.g
add a not supported warning for multiple type parameter upper bounds
as per discussion in #418 
fix #417 add error for unsatisfiable upper bounds
replace CCE with meaningful error
Code fixes because of API change in CeylonUtils
Module: added major/minor binary versions
Fix #401 and add tests for member alias refinement
Updated intro texts for start and tutorial pages.
Reorganizing directory structure and adding 1.4.0 code.
porting from 2.6.35... part2
created a warning for big titles
TG: copied selected controllers and views from previous project
Added Joe's bio.
replaced graylog2-server mongodb_host entry from localhost to 127.0.0.1 to work around java/graylog2 weirdness that means localhost is incorrectly resolved to 127.0.1.1
removed patch of reader.rb from graylog2-web because that file doesn't exist in the source package
removed full path for bundle gem from graylog2-web as it didn't exist in that location
Initial commit
Imported metathesis-v2.0

metathesis - Sample LaTeX Thesis Template
http://www.cs.mun.ca/~donald/metathesis/

	% wget -c 'http://www.cs.mun.ca/~donald/metathesis/metathesis.zip'
	% unzip metathesis.zip
Modified Makefile for multi-platform compatibility

Deleted full path to commands in aliases
First draft. Includes part of the proposed index for revision
Added babel module to handle text in spanish
New line changes
Removing torusoftNew folder and moving all files in root folder
made plugin data be consistently stored in <config_path>/pluginData.json
201209111213
Croatian translation : ppero196
Prepare for release 1.04
Fix an SQLiteException
Merge branch 'master' of github.com:royale1223/HwaSettings
Update changelog
Customizing CSS for screen
fixed styling based on feedback
Add some current user checks for non auth'd views, add proc to create solution validation
Added require open-uri.
Socket connection started

persistent storage of events in progress
Add user Edit
Add user edit
Add update action
Successfull edit
Include SessionsHelper moduleto UsersController
Include SessionsHelper module to UsersController
Add before_filter to User
Add friendly forwarding
Change session controller
for cloud9 edit
remove debug param, it doesn't work with db lock
- changed the URL in the readme to http://localhost:8080/
not much changed minus create accoutn
	modified:   scout/html/index.html
Fix #1471 - add explicit type cast.
timeshift: Reworked the reader engine to common up things and prepare for seek support.
Fixed styling on recipe level (h3, ul)
Minor changes so pages do validate now
Added styling so HTTP code's and methods are more visible and show indicator if used as an anchor
fix typo's
Merge pull request #10 from mstalfoort/feature/layout-fixes

Fixed styling on recipe level (h3, ul)
Merge pull request #11 from tvlooy/typos

fix typo's
Added user to valid methods.
Remove kernel.dcpu16 I accidentally added
about action and rspec tests
check remote /etc/.git file on git init
extended builds
extended builds
release note page rename
release notes rename
[task/travis] Removing development information
[task/travis] Add automated testing to readme
Make the htaccess file configurable

create a sample.htaccess file so that you can customize your rewrite base.
Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from mfairchild365/master

Make the htaccess file configurable
Commit at 17:58
added helper for pyx compilation and import
improved info maintainance in PXDParser
started CodeGenerator.py
Add public/uploads to shared childrens
adding dimensions with pt3dadd but this doesn't seem to be working - unsure why
Add jshint to bundles.
a build should have resultset even though having a status failure
Improving test infrastructure
Added list elements
Finished Education, theme tweaks
Resume final
format jsfiddle templates links
readme: build description update
disable nowrap in error-block css
do not show sourceError as element text
removed default dataType=json
remove datatype=json from submit api method
submit api method refactor
changelog and submit method docs
nochange reason for hidden event
datepicker: fix arrow click after clear date
address inpt autosubmit method
remove all socket listeners when removing the connection
Applied fix for socketChannel leak in ClientRequestExecutorFactory.create().

Added bullet to release_notes.txt about this fix.
exe9 - socket.io node with httpserver

this exercice consists on a http server node that suports connection
with websockets. the client side of this demo can be found on the
myPage.html
Add shape:inGroup()
Site updated at 2012-08-10 13:05:51 UTC
restructure the pydarn.radar module in anticipation of a database-based radar.dat and hdw.dat info
mend
Merge branch 'master' into network
switched local radar db to hdf5
implemented database and hdf5
fixed bugs
wqadded local hdf5 file for radar.dat and hdw.dat info
more bug fixes
final bug fixes (hopefully)
run test with new Db implementation: bug fixes, install script updates, __init__ updates
final commit before merge: hdf5 update only
moved stupid tests
bugs fixed at ksymbol function
modify test
fix the c-sidebar's a css
上传样式修改，  “加载更多”    按钮
添加console测试
先把 append 改为了html ，估计在页码不超过1（每页不超过10的情况下，正常了），但是点击更多的时候，应该还会有问题
add init file for goto-last-change,redo+,wgrep
- Removed stray dead code
Changed player's starting position when it resumes
Add json api for events
JSON output for event
Added records for NIWO.
Added records for CAPL. Unidentified species not included. There are probably TONS of duplicated records in my past few commits.
BUGFIX: Kappas do not have to be invertible
Force xpi to work until Firefox 100 is released. Then I just don't care any more.
xpi for new version.
Removing old xpi
Trying cookies
fix exceptions and error codes
Поле unitext для этимонов отображаем в админке, но спец.образом.

Это поле отображается только для греч. этимонов и, когда язык этимона не
выбран. Поле text всегда отображается для языков отличных от греческого,
а для греческого только в случае, если в этом поле что-то уже имеется.
Рефакторинг импортов.
рефакторинг неоправданного использования переменной.
Рефакторинг импортов.
Рефакторинг вьюшки all_entries
В списке полных статей можно отобразить все статьи со сломанным греческим.
fix for regression in image loading on detail page
increase accuracy when talking to the satellites
Merge pull request #224 from jdlrobson/geoaccuracy

increase accuracy when talking to the satellites
Updated to 8.4.14 and added patch for uuid-ossp on Mountain Lion.
change ec2Request to requestQuery
Move connecting with addrinfo in function
Switch open functions to use int failure convention
Add a return value to unix listener open
add air submodule
添加了README.rst做为项目的正式开始
implemented bogo-t distance
Write pipeline version number to QC directory
Updated usage information
Modify version log text
Add version logging to genotype calling workflows
Merge pull request #83 from iainrb/devel

Record version number in output
added a new interface, simple test case and some content in the actual
api code with updated pom
Initial
renamed to a test class
implementing more methods
unit test -- failing on post/search at the moment
test
Merge branch 'modeling-users' of https://github.com/xavierva/sample_app into modeling-users

Conflicts:
	.metadata/.plugins/com.aptana.core.io/connections.4
	.metadata/.plugins/com.aptana.core.io/connections.5
	.metadata/.plugins/com.aptana.core.io/connections.7
	.metadata/.plugins/com.aptana.syncing.core/defaultConnection.4
	.metadata/.plugins/com.aptana.syncing.core/defaultConnection.5
	.metadata/.plugins/com.aptana.syncing.core/defaultConnection.7
	.metadata/.plugins/com.aptana.syncing.core/sites.4
	.metadata/.plugins/com.aptana.syncing.core/sites.5
	.metadata/.plugins/com.aptana.syncing.core/sites.7
	.metadata/.plugins/com.dubture.symfony.index/symfonymodel.2.log.db
	.metadata/.plugins/org.eclipse.core.resources/.projects/sample_app/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	webrat.log
Fix file conflict between xbmc-bin and xbmc-eventclients-wiiremote packages.
Removing xbmc-bin.manpages as xbmc-bin has no manpages to install.
Bump to Standards-Version 3.9.3.
adding flash save/restore of ip address
update label to badge
Modified the README to show the demo link
commit from eclipse @ fosco.
commit from Eclipse @ fosco.
changed link to RSVP
fixed again ssl problem
Replace function addslashes() -> mysql_real_escape_string()

http://japan.nucleuscms.org/bb/viewtopic.php?p=28908#p28908
Replace var TYPE -> ENGINE (for MySQL 5.5.x)

http://japan.nucleuscms.org/bb/viewtopic.php?p=28908#p28908
Assigning the return value of new by reference is deprecated (PHP 5.3.x)

http://japan.nucleuscms.org/bb/viewtopic.php?p=28908#p28908
Add driver for PrimeCell Vectored Interrupt Controller (PL190)
Add support for QEMU's version of Versatile Platform Board
Teach sysctl(8) about parsing a file (while I'm there also give it
capability of parsing both = and : formats).

Submitted by:	hrs (initial version, bugs are mine)
MFC after:	3 months
virtio: Start taskqueues threads after attach cannot fail

If virtio_setup_intr() failed during boot, we would hang in
taskqueue_free() -> taskqueue_terminate() for all the taskq
threads to terminate. This will never happen since the
scheduler is not running by this point.

Reported by:	neel, grehan
Approved by:	grehan (mentor)
Fix VIMAGE build broken in r244185.

Submitted by:	Nikolai Lifanov <lifanov mail.lifanov.com>
Add an #include guard to the sys/fnv_hash.h.

MFC after:	3 days
  Fix error in r235991. No-sleep version of IFNET_RLOCK() should
be used here, since we may hold the main pf rulesets rwlock.

Reported by:	Fleuriot Damien <ml my.gd>
Whitespace cleanups.
If we are not going to clear the dump (we are either just checking if the dump
exists or we want to keep it), open device read-only.

Obtained from:	WHEEL Systems
The clear option (-c) is not compatible with keep (-k) and compress (-z)
options.

Obtained from:	WHEEL Systems
- When checking if a dump exists on the given device there is no need to
  provide dump directory. Eliminate this redundant argument. This changes
  the usage, but the only risk here is that a warning will be printed
  about directory given as device.

- Update usage of -C option.

- When clearing dump header from the given device there is also no need to
  provide dump directory, although additional arguments for -c were not
  documented.

- Document that -v can be used with -c and that list of devices can be given.

Obtained from:	WHEEL Systems
Minor refactoring prior to .symbols file changes

- Combine .if x and .if !x using .else
- Separate out beforelinking dependency
- Add comments to clarify .if nesting

Sponsored by: ADARA Networks
The group list for a non-default export entry (a host/subnet one)
was being copied from the wrong place. This patch fixes that.
This could cause access failures for mapped users, when the group
permissions were needed.

PR:		147998
Submitted by:	Christopher Key (cjk32 at cam.ac.uk)
MFC after:	2 weeks
Put shared library debug info into separate .symbols file

Sponsored by: ADARA Networks
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:yaneurabeya/freebsd
Removed synthesizers, added a demo of image decompression in background
Modernization
Fixed some warnings
Fixed background loading of images, by @merowing_
Dispatch async added to another call
Added retina display support
Fixed scaling call
Saving to cache happens on a background GCD queue, yay for performance, esp images
Cache directory name is now within a dispatch_once block
Minro fixes
Removed iOS 4 support, no fall backs, always use NSJSONSerialization
Added a not modified handler
Deprecated onCompletion:onError method in favour of addCompletionHandler:errorHandler: method
Updated readme
fix line breaks.

add and remove line breaks in front of documentation blocks for better readability.
Merge pull request #213 from yep/master

fix line breaks
From: http://stackoverflow.com/questions/4995254/nsmutablestring-as-retain-copy/5002646#5002646
The recommendation is to use copy for classes that are part of a class cluster that have mutable/immutable pairs; such as NSString/NSMutableString NSArray/NSMutableArray NSDictionary/NSMutableDictionary NSSet/NSMutableSet.
The reason for this is that it is possible to have a property that is declared as an immutable type (such as NSString) yet pass it a mutable type (such as NSMutableString). In which case it is possible to change the property from outside the class as Taskinoor describes.
Using copy is recommended, because it behaves sensibly with class clusters. sending copy to a mutable class returns an immutable copy of the object (i.e. sending a copy message to an NSMutableString returns an NSString). But, sending copy to an immutable counterpart is equivalent to sending it a retain message.
Merge pull request #215 from Hout/master

Use copy property attribute for immutable types
Update README.mdown
Warning related to dispatch queue fixed
ルータの章 経路表、ネットワークアドレス
使っていない図を削除
TDD の章のドラフト完成!