labofsahil/github-event-dataset-2012 huggingface dataset:
Fixed negative spawnrate
Merge pull request #462 from Scavenger3/Spawnrate

Fixed negative spawnrate
Added xmas hook such that when the server checks to see if it should do xmas related things, it will check all plugins first.
Merge branch 'general-devel' of github.com:TShock/TShock into general-devel
Fixed bans and warps being deprecated.
Merge pull request #463 from TShock/general-devel

General devel
[Rest] Add support for jsonp
Merge pull request #465 from Scavenger3/RestJsonp

[Rest] Add support for jsonp
Cleanup code and make it pass JSHint
Clean up code (passes in jsHint now)
Merge branch 'mousetrap' into dev
Add orography metadata file

Progresses issue #6
Building PHPUnit tests
Changed logos from CSS to Html.
Working menu and other testing
Override TERM variable if fbterm is supported. Also, placing this sessions.py file that'll either be handling all this session stuff whether or not I decide to make PAM official. Also,
it'll have the code necessary to enforce password expiry if PAM support isn't enabled (if PAM is going to be an optional thing)
HABTM a modelo document_tag_relation =)
Etiquetas => Contadores y parte publica

Counter_cache artesanal para hijos y documentos de etiquetas
Mas filtro por etiquetas en parte publica (catalog)
Merge branch 'master' into counter_cache

Conflicts:
	Gemfile.lock
Liberados de simple_autocomplete gem =)
Mejorado control de turnos
Temp fixed MasterLoot error.
Replaced php string functions with methods located in StringUtil
Fix for CakeEmailTest.php that failed unless using 'localhost'
Fix notice error when parsing input data.

Prevent error in CakeRequest from parsing input data in
PUT and DELETE requests.

Fixes #3002

Signed-off-by: mark_story <mark@mark-story.com>
Merge pull request #707 from SimonEast/fix_CakeEmailTest

Fix for CakeEmailTest.php that failed unless using 'localhost'
Fix lint error.
Make test case use SERVER_NAME conditionally.
Automatic console logging streams were not respecting --quiet
Update afterSave to ensure created entires have all translated fields present

Without all fields being present, find() will be unable to find the
translated records.

Fixes #3009
Add tests for translate + partial fields.

Refs #3009
Fixed some typos in the comments in this file. This helps with type
hinting in IDEs that support that.
Merge pull request #710 from iliepandia/fix.typos

Fixed some typos in the comments in this file.
Adding missing afterValidate callback to behaviors, Fixes #3024
Correctly passing ellipsis options to all internal method calls insie
PaginatorHelper::numbers(), under some combinations of modulus/limit
it would not get passed even though there are pages in between to show
Fix missing line breaks.

Fixes #3028
Type check before unset()

Calling unset() on string indices fails fatally on 5.3.x and lower.

Fixes #3027
Remove trailing whitespace.
Fix web runner showing fails as passes when show_passes is on.

Fixes #3035
Fix XML decoding attack via external entities.
Fix warnings when deleting records that do not exist.

Fixes #3037
Allow warnings for Xml entities.

For some installations libxml_use_internal_errors() does not work,
a warning is another way to measure the entities not being loaded.
Loosen exception types.
Reshaper gitignore
activation smtp

Signed-off-by: laurent <socialhbooster@gmail.com>
modifications des repertoires cache
init boxfile
mise a jour

Signed-off-by: laurent <socialhbooster@gmail.com>
Use maven-compiler-plugin 2.4
Fixed BukGet downloads
Optimized the counting of digits
Disallow overriding of these two methods for thread safty.  
added randomColor function...for getting a random color.
Fix mis-named event (EntityChange|D|WorldEvent). Improper names are
improper.
Added ServerStart and ServerStop events.
Minor formatting fix in PluginEvent

Signed-off-by: Sleaker <sleaker@gmail.com>
Merge pull request #306 from Sleaker/master

ServerStart/Stop events.
smurf: small patch to improve messages
Restoring to working state.
Updating ignore.
Updating spark dependency and Readme.
GroupByKey takes a partitioner argument. Respected in both Crunch and Spark.
Materialize (Crunch & Spark) and some formatting.
Sample for Crunch & Spark.
Adding fusion prevention rules.
Implemented partitionBy and cogroup.
Adding sort for crunch and sortByKey for Spark.
bugfix and cleanup.
Merge commit 'ad56c9715027a2e6b19c4ec7b375eb34845f8d9c'

Conflicts:
	dsl/src/main/scala/ch/epfl/distributed/CodeAnalysis.scala
	dsl/src/main/scala/ch/epfl/distributed/DList.scala
Readme cleanup.
More fixes for the Readme.
More cleanup.
Various updates.
Merge branch 'master' of github.com:Stivo/Distributed
Number of splits in API:
- supported for group by key and join.
- Scoobi compiles, Spark & Crunch work.
Spark buffering:
- Using special datastructure for buffering
- only buffer one element.
New generated programs used for the paper.
Some other files, committed for easy merge.
Merge branch 'temp' into bigdata2012
Update zp_world/command.sql

Removed ".gm fly mode" listing, since no flying aura exists and command does not execute.
Removed extra import and added supresswarnings
.
fix compilation
ELLE JOUUUUUUUUUE \\\\\o/////
Merge branch 'master' of github.com:Taldrain/GogoGame

Conflicts:
	test/group_managerTest_pos.ml
Merge branch 'master' of github.com:Taldrain/GogoGame
Merge branch 'master' of github.com:Taldrain/GogoGame
Joue en  mirroir, strategies Fuseki, UCT, negascout
.gitignore
Add simple instructions
use busybox instead of builtin umount function
inital commit for Scotch rewrite.
ignore the log folder
The posts controller should redirect to the dashboard when it can
update readme to reflect the new install path
spec out the the main index of the site
spec out the dashboard controller
whitespace and comment fixes for main.js
spec out init.js
Fill out the package.json file and make the app default to mongo
get posts working a little better
make the show page more customizable
stub out css file for users
adds a title property to the site model
got install looking ok
got the install flow working
make dev work on a remote server
Holy shit it's a big one

- new theme for the whole site
- dashboard/posting/editing is now complete
- single post page is done
- index page is subbed in for now
fixed bug with post deletions and updates
added a message if there are no posts yet
make sure there's always some sort of site defined
Added names
Merge branch 'master' of github.com:TheBosZ/CS322-HW3
Working on file
Merge branch 'master' of github.com:TheBosZ/CS322-HW3
Update booklist.md

Add "Working Effectively with Legacy Code" and links to everything else.
Merge pull request #2 from sbecker/patch-1

Add "Working Effectively with Legacy Code" and links to everything else.
enkele kleine methodes
Change ZoneRules to reference Duration instead of single unit Period

See #101
Change to use ISOPeriod instead of single unit Period

See #101
Change ZoneOffsetTransition to reference Duration instead of single unit Period

See #101
Change PeriodUnit.between to return long instead of single unit Period

See #101
Javadoc - remove Period reference

See #101
RemovePeriodFields
Changes to db to push to amazon EC2.
Moved CAS requirement into 'Security'
Location Assignment now prefers locations with the fewest # of rooms
When will I remember to build?
Fixed empty term parsing.
Finishwed documentation translation to english
Minor code styling following pylint rules
Merge remote-tracking branch 'upstream/master'
Trying to fix IE-specific float issues
changed a lot of the internal representation for a massive performance increase, sadly this means less functional code
 changed a lot of the internal representation for a massive performance increase, sadly this means less functional code
Revert " changed a lot of the internal representation for a massive performance increase, sadly this means less functional code"

This reverts commit 755e7b90a42b8878004ef497e0eb144352bbec28.
* Add medium resource with endpoint: /media;
* Add medium model with a draft structure;
* Add model configuration;
* MONGO_URI is extracted from os.environ;
* Set-up unit and functional tests;
Added more styling & structure for mentor show
Cosmetics
Reverted commit d26eb1a82146dfd364da1b2da60128d74ec2f264
added banner ads
Mixed ad types to remove dupes
Rename lineEdit to LE
Further clean up of things that shouldn't be in the rootfs
Signed-off-by: Gustav Dahl <Linkthewindwaker@gmail.com>
Added some basic performance testing code.
Improved error message for missing dangling reference.
Added basic CMS classes.
Added some flags and fields in CMS classes.
How could I forgot about update and create methods in these tree files?
Undid the last commit, it made Fowlt crash
#38: Removing the code and config for Zorb and Peon. They won't be needed since Acolytes are the target creature base.
Updating sps-gamelib to leverage the resource pool for points.
quick replacement of images and text
font-size of availability feature
Changed Makefile to delete execute file
Werkt min of meer, maar scoort gek genoeg wel lage percentages (70%
accuracy)
Update basepath
Don't blow up the fallback method just because a plugin isn't
compatible.
Prevent method #3 from creating uneeded proxy objects.

This would happen if the NetServerHandler is already a proxy, and
the injection method is unable to create an instance of the proxy
type. 

It's best to fail instead of polluting (due to constructors with
side-effects) Minecraft with failed proxy objects.
Moved all player related injection methods into a separate package.

This should make the code a little bit clearer.
Adding "support" for Spout by proxying it's NetServerHandler.

While it may seem better to use a Spout PacketListener, we can't
prevent other spout listeners from stopping the listener
chain. For instance, Orebfuscator does supports Spout, but does this
by cancelling every chunk packet and sending them to be processed and
sent by Orebfuscator only. This can never be made compatible with
other plugins.

So, we choose to add some overhead and inject our proxy onto Spout. 
Fortunately, Spout injects the proxy using a player listener on LOWEST, 
so we get to override Spout again with our HIGHEST. The proxy method
should be generic enough to handle most proxy types.
Make the proxy creation even more flexible. 

Now we even support Orebfuscator without using Spout.
Bumping to version 1.3.0
changed taginput css
Merge branch 'master' of ssh://github.com/aatash/07.21.2012
configure-cluster: Adding --force SERVER
Adding more validation/logging for configure-cluster --force
Handling a NoneType error in "list-clusters"
list-clusters: More descriptive error message when member is invalid
Logging tweaks
put --yes on all mongoctl test cases
Move interactive flags check to prompt_confirm
Making test case "install_test" use a temp mongodb installs_dir
Resetting to original mongodb installs dir on "test_install" tear down
Temporarily remove "install_test" since it currently can uninstall from test suite until we figure out how to fix it
Temporarily remove "install_test" since it currently can uninstall from test suite until we figure out how to fix it
Syncing with main
Add Mob animation and explosion.
Adjust bg props placement.
on_stream_features is now an available event of interest, used by register_user.php example where instead of auth as the next step registration is required
xmpp_stream states can now be outside of jaxl instance object (interesting? or may be not, currently used by register_user.php example)
added inband registration xep
commented info items call as of now
added register_user sample example, can we simplify this flow?? can things move into core (maybe yes)
cleaned up register user
catching error code, type, text on regitration failure
added basic pubsub xep operation, example publisher.php and subscriber.php to walk through available api
removed ^M, need to fix my eclipse, else this is gonna be insane
minor fix in http pre bind (yet not in action)
0060 i.e. pubsub examples are up for a try now
cleaned up muc_log_bot.php example, better console output minus debug logs
now we have a generic loop class which can select over multiple fds and send appropriate callback when an event of interest (read/write) occurs, multiplexed both read and write select and thus this should speed up things
^M will kill u now
added the time server which will do the timed fun calls
Comment tmux.conf
Add easier window switching to tmux.conf
master-detail layout and fragment communication works.  added dummy content.
Added the Friends page.
Merge pull request #2 from bananasims/frontend

Added the Friends page.
Fixed img codes in contact.html and about.html to show site logo on gh-pages
add global gitignore rules
Removing greptasks moving around tmux layouts
Prepare 0_1_1
[maven-release-plugin] prepare release adaptrex-0.1.1
Fixed association route input signals.
created gitignore
made a example configuration
minor readme edits

Fixing typos.
Add a Ctrl+A + command to split current pane in four (2 horizontals + 2 verticals)
Added github address to readmes.
fix extenstions, update gitignore
otros correcciones
Add a method to split sessions around a given timestamp.

Signed-off-by: Jason Lynch <jason@calindora.com>
fixture junk file deleted
Add util.py for miscellaneous utility functions and more clean up
45 degree orientation
Test on travis-ci
Add travis badge to README
Use JSONExp from npm
Reference JSONExp in the README
Rename 'variables' to 'bindings'
Release v0.1.0

* Depend on JSONExp from npm
* Refer to JSONExp documentation in the README
* Replace the misleading "variables" with "bindings"
* Continuous testing on Travis CI
Removed 'transport' argument from example since 'socket' is the default
readme update

update to readme
Fix jmxml-ssl: don't specify hostname, so uses 0.0.0.0
Merge pull request #368 from ahgittin/feature/issue-315-rebinding

feature/issue 315 rebinding
fix JavaOptsTest following removal of hostname as jmx property we set
better persisted format -- compresses type info for most maps, lists, etc; compresses repn for map entries; and suppresses empty fields in the memento
simplify map repns even more, using <key>value</key> in the simplest case; and reorder+rename top-level fields so that the classes seem friendlier
persist inet4 addresses in a nicer way
remove activesupport from runtime dependencies
There, connection logic seems more sensible now
Removed orphaned submodules and added install
Fixed setting that allows transparent terminal
Added dircolors
Holas equipo les mando la base de datos para empezar el protipado e implementacion de la gestion de usuarios...
Add inital design and files to Master branch.
Added heroku cron
change from redis to mongo
merge
Fixing bad structure
Initialize SSL when needed only, and disable SSL on errors

With this patch, the SSL subsystem will only be initialized if at least
one SSL ports is configured; so you won't get "SSL initialization failed"
messages if you didn't configured it at all.

And if SSL initialization fails, no SSL listen ports will be enabled
later which never could establish a working SSL connection at all ...
Free all listen ports on initialization

Now you can reconfigure listen ports and reload the server configuration
on runtime. Without this patch, no ports could be removed.
WHO #channel: don't limit list size

It makes no sense to limit the list size when doing WHO for a channel
and not to return all the users in that channel, so I removed the check.
But if there are more than MAX_RPL_WHO(25) replies, the client requesting
the list will be "penalized" one second more (then 2 in total).

This fixes bug #125.
JS101: Object.create
jQuery Roundup: Flex, jquery-binddata, jquery.notification
tmux: highlight current window in status bar
worked on the datastore
graph realized
fix auto-save restoring
Errors are displayed in summary and detailed manner

@author Magnus
@author Seema
project journal: fix update image, add email notification preference
WIP charts and logs
Removed multimaterials example.

Anyways it wasn't working since we dropped multimaterials.
- Fix BaseXDavServiceProvider filters + locks settings
update the ace editor for snippet
build: compile with -g and add .h files as dependencies
bin2fex: decompile GPIO entries
Apply strict compiler warning flags

Check that the compiler accepts the warnings flags and include them in
the configure summary.
Tidy desktop file

Remove full stops at end of comments. Change StartupNotify to true.

Based on a similar patch by Andrea Carpineti <carpineti.dev@gmail.com>
and Maia Kozheva <sikon@ubuntu.com> found at
https://github.com/stsquad/easytag/issues/15 and included in the Debian
and Ubuntu packages.
Many typo and spelling fixes

Fixes https://github.com/stsquad/easytag/issues/14 and
http://sourceforge.net/tracker/?func=detail&aid=3560431&group_id=5216&atid=105216
at least.
Simplified
Added Microposts Resource
Finished the demo app
Actually copy files if they're newer
Added script to install fonts, and fonts themselves
Fix setup_fonts script
Collision map saving.
Better styling for tags
Make clean delete all compiled Python files.
Move the two-line function parsing test into the new format.
Removed debug messages from wand commands
version++
Temporary tweak: patch in __pairs and __ipairs from 5.2 into lua 5.1.
Implement __pairs and __ipairs for DF objects.

Structs enumerate fields in memory order in pairs().
Containers & biftields enumerate int indexes in ipairs, and
string keys in pairs (i.e. using index-enum for arrays).
Allow assigning NULL lightuserdata to pointers, and export a global.

Otherwise there is no way to specify NULL via recursive lua table assign.
ruby: ANY_FREE/IN_PLAY
Fix an error in gui/workflow when enabling, and tweak color.
Tests considering removing of the title
kernel default governors switch
Fix readme blocks, and some instructions
Win8:Forecast: initial project setup
Combine timeline and histogram tabs.

Synchronise time / program selections between all profile data views.
Fix bug in profiling time synchronisation.
Revert "Human legible d3d9 error messages."

This reverts commit 6fac7b94c57cb084204dfad6430dfd22d30f33f7.
- adding support for GWT compilation
- start building interfaces
add a test related to piecewise functions or differentiation through if/then branches
payment pojo modified
Add support to doctrine MongoDB Document Manager integration
TOPSIS working
temporarily remove mock modules
Support preserving library source attachments.
Fixed an anchor bug caused by Firefox not liking the slash'd hashes
installer default is aura package
Update package.json
Merge pull request #43 from aredridel/patch-1

Update package.json with new Github location
virt.kvm_installer: Don't fail a test if virtfs_proxy is not defined

This userspace program is not shipped on a regular qemu source
code checkout, so its absence doesn't need to fail a test.

Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>
virt.virt_env_process: Reorganize screendump thread termination

Simplify the check for screendump termination thread event,
and also avoid a bug where we try to set a delay to a None
object.

Fixes the following bug that happens when running the
multi-disk test:

 Exception in thread Thread-1:
 Traceback (most recent call last):
   File "/usr/lib64/python2.7/threading.py", line 551, in
__bootstrap_inner
     self.run()
   File "/usr/lib64/python2.7/threading.py", line 504, in run
     self.__target(*self.__args, **self.__kwargs)
   File
"/home/lmr/Code/autotest.git/autotest/client/virt/virt_env_process.py",
line 549, in _take_screendumps
     _screendump_thread_termination_event.wait(delay)
 AttributeError: 'NoneType' object has no attribute 'wait'

Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>
migration_with_reboot: set login_timeout for vm.reboot

Currently we reboot with default login_timeout in
migration testing, case might fail to login.
This patch passes user assigned login_timeout for
vm.reboot()

Signed-off-by: Amos Kong <akong@redhat.com>
Untrack .vim/.

Since all bundles are managed by vundle though variables defined in vimrc, there
are only git repos and tmp files reside in .vim/. No need to track it any more.
P2P: Add support for preferred channel list

p2p_pref_chan configuration parameter can now be used to set the
list of preferred channel for P2P GO Negotiation. This will be used
in the priority order if the peer does not support the channel we
are trying to use as the GO (configured operating channel or the
best 2.4 GHz/5 GHz channel) for the case where a forced channel is
not used.

p2p_pref_chan=<op class:channel>,...

For example:
p2p_pref_chan=81:1,81:2,81:3,81:4,81:5,81:6

This would configure 2.4 GHz channels 1-6 as the preferred ones with
channel 1 the most preferred option.

These configuration parameters can be set in wpa_supplicant.conf and
dynamically updated with "wpa_cli set <param> <value>".

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
(cherry picked from commit 21d996f775a2131bb0c73d6e18ca9b382f017057)

Conflicts:

	wpa_supplicant/config.c
add Signpost 'client server' in OCaml that I did with @sebastian today (still WIP)
tweaked vim text wrapping and disabled pymode defaults
&nbsp -> &#160 (XML compatibility).
crlf improve
Merge branch 'master' into 1.0
crlf improve
Merge branch 'master' into 1.0
slow match
Merge branch 'master' into 1.0
proxy.ini
Merge branch 'master' into 1.0
fetch.go
Merge branch 'master' into 1.0
bugfix
Merge branch 'master' into 1.0
remove debug print
Merge branch 'master' into 1.0
refactor
switch from multipleconnection
Merge branch 'master' into 1.0
1.8
Merge branch 'master' into 1.0
fetch.php
Fixed rigging dependency in package.
If an id is specified, only return a single item in a call to a scaffolded 'find'
Added a comment regarding generation of board.
Lots of changes to balUtilModules, requires more testing
Windows compatibility
Fixed isWindows being true on "darwin" platforms - bug was only in dev
Got getNpmPath working on windows
Published v1.3.0. Updated history to reflect markdown nom change.
Super_Mario

rename
Update modules so they are readonly
Add tests
Merge pull request #24 from basho/djr-tests

Add tests
Dialyze riak_search beams, not the deps
Remove files that aren't needed
change example url
add Rect#setColor method.
add Rect#setColor method.
add Rect#setBorderWidth method.
Merge branch 'master' into gh-pages
updated .gitignore, makefile: got rid of conditionals around -include, added -g to link
django bash autocompletion added
simplify core data Models
get images from parse.com
first attempt at uploading images to parse.com (not working yet)
i003-z001 #13
init PicIndex project
Fix running portupgrade/portinstall from a port dir

Reported by:	ache@
Merge branch 'maint'

* maint:
  Fix running portupgrade/portinstall from a port dir

Conflicts:
	NEWS.md
	lib/pkgtools.rb
Avoid installing ports inside WRKDIRS
Update NEWS
Fix Frozen string error with 1.9 when using BEFORE/AFTER* hooks in pkgtools.conf

The following code behaves differently between 1.8 and 1.9:
foo = "bar"
foo.freeze
foo.sub!(/^[;\s]+/, '')

1.8 ignores the frozen status unless the sub!() actually changes
something. 1.9 returns an error immediately regardless of what sub!()
does.
2.4.9.8 Release
Install script(1) into PREFIX/libexec/pkgtools

* This fixes broken script(1) on < 8.1 not returning proper exit status.
* This is documented in bin/146189
* This is taken from HEAD r226403
* Addresses #8
Use fixed script(1) in PREFIX/libexec/pkgtools if it exists.

Fixes #8
Add fixed script(1) to NEWS (#8)
Always check for fixed script ondemand to fix portupgrade upgrade

Fixes #34
Updated the version of clojure-mode to 1.11.5. I also removed the unused folder in favour of just using just the clojure-mode.el directly
Automatically put emacs into diff-mode when editing COMMIT_EDITMSG from git
# Updated shrinking the header - absolute values + body.home constraint
Updated docs for unicode flag
Design1, classes page with sidebar
Add a random comic on index
quest close button
views/quest/add.js: whitespace fixes
render fatal (non-json) errors correctly
Added 1 second timeout on playlist item refresh, to partially help caching.
Issue 2367: Initial integration of TinyMCE editor into Cases edit page.
Issue 2401: Make text block editable.
Fixed bug to set select option after ajax reload.
Issue 2369.
Actualizacion cuena corriente
Added cache parameters
Payments via z-payment.ru
Prepared source files for interfacing C++ functions to R
Changed DNS to "thebestrestaurantfood.com"
be nem jelentkezett user kezelesenek atalakitasa
bejelentkezéssel kapcsolatos javítások, kollekció kiegészítése
kollekcio letrehozasi hiba
Fix incorrect case case counting
LLVM codegen for cases of integers
More form tweaks
Merge branch 'bootstrap' of github.com:blueriver/MuraCMS into bootstrap
Fixed a bug in the :javascript filter
Should have created a test file
Added a test for :javascript filter
Push to 1.3.2
fix another dead local store

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Revert "add an explicit cast to satisfy FB"

This reverts commit 589b27f0e75da9d78e82835c72ba70d9b575c4d7.
Aestethic changes suggested by Eelco, and trying to fix
the problem on rpc.statd, that looks at /etc/netconfig.

Problem: http://hydra.nixos.org/build/2310686/log/raw



git-svn-id: https://nixos.org/repos/nix/nixpkgs/trunk@33322 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb
Configured for deployment to Heroku
gemfile changes
Example 3.5 (fig 3.10).
Updated, optimized and rewrote the security system quite a bit. Also improved the lucene interaction and much more. Better logging as well. Huge checkin due to problems with merge.
Added test exposing segfault in history
Revert "Revert "Version 0.00""

This reverts commit 88ce163d43be84f80ecb93f04b755a32c2989629.
Removed xoauth.py dependency

Replaced with nodemailer.createXOAuthGenerator()
Adding a random password generation script.
default.xml: add in v8 repo of mine
one more font included
Update README.md

Git web app idea
Added timeline to experience
improved fellowship selection
Unit tests and a small bug fix.
idle: don't lose socket after first use

Also - clean up after self by using idle_init()/idle_done()
rather than the braindead "idle_enabled()" multipurpose
interface.
Updated addSong to allow for songs to be inserted in between other songs
Updated addSong to handle multiple selections and insertions of songs into the compile list
Simple attempt to run tests on Travis-CI
model: setter with notify
markers do tipo ADD sempre na frente dos outros.
Finished image uploads, though not with s3 on local
Rewriting Splash page to not have hardcoded values
Merge branch 'master' of https://github.com/bsdocke/Phone-Tag

Conflicts:
	src/com/android/activity/SplashActivity.java
Modified 'it' changing method to skip players that aren't listed as playing
fixing the analytics placement
added base catalogue page
changed BG along with updated catalog page
various updates to cataogue and main page
fixing the demo app pages
fixed the thing that annoyed christian because he's obnoxious.
up r
up R
Connected the manifest search field with the manifest array controller.

In other words: searching works now.
Add buildbotbin option for try command.

Allows specification of the buildbot binary to use to run tryserver on
the buildmaster host. Handy for buildbot installations in virtualenvs.
Delete Python2.4-specific code for use of md5 library.
Add documentation of the buildbot try --buildbotbin= option.
Merge branch 'pull354'

* pull354:
  Add documentation of the buildbot try --buildbotbin= option.
  Delete Python2.4-specific code for use of md5 library.
  Add buildbotbin option for try command.
Fixed spurious failues due to differences in file-exists errors on windows and nix
Merge branch 'bgbl-2-2012-20'
Minor spelling fixes.
Merge branch 'upstream-fixes'
Gesetz zur Änderung telekommunikationsrechtlicher Regelungen

09.05.2012: BGBl I: 2012, 958 (Nr. 19)
Merge branch 'bgbl-1-2012-19'
Gesetz zur Änderung des Gemeindefinanzreformgesetzes und von steuerlichen Vorschriften

11.05.2012: BGBl I: 2012, 1030 (Nr. 20)
Vierzehntes Gesetz zur Änderung des Luftverkehrsgesetzes

11.05.2012: BGBl I: 2012, 1032 (Nr. 20)
Merge branch 'bgbl-1-2012-20'
Gesetz zur Änderung des Bürgerlichen Gesetzbuchs zum besseren Schutz der Verbraucherinnen und Verbraucher vor Kostenfallen im elektronischen Geschäftsverkehr und zur Änderung des Wohnungseigentumsgesetzes

16.05.2012: BGBl I: 2012, 1084 (Nr. 21)
Siebenundvierzigste Verordnung zur Änderung straßenverkehrsrechtlicher Vorschriften

16.05.2012: BGBl I: 2012, 1086 (Nr. 21)
Merge branch 'bgbl-1-2012-21'
Gesetz zur Umsetzung der Hochqualifizierten-Richtlinie der Europäischen Union

08.06.2012: BGBl I: 2012, 1224 (Nr. 24)
Merge branch 'bgbl-1-2012-24'
Vierte Verordnung zur Änderung der Apothekenbetriebsordnung

11.06.2012: BGBl I: 2012, 1254 (Nr. 25)
Merge branch 'bgbl-1-2012-25'
Gesetz zur Stärkung der Pressefreiheit im Straf- und Strafprozess

29.06.2012: BGBl I: 2012, 1374 (Nr. 28)
Erste Verordnung zur Änderung der Verordnung zur Gleichstellung von Prüfungszeugnissen der Erwin-Stein-Schule, Staatliche Glasfachschule Hadamar, mit den Zeugnissen über das Bestehen der Abschluss- und Gesellenprüfung in Ausbildungsberufen

29.06.2012: BGBl I: 2012, 1387 (Nr. 28)
Erste Verordnung zur Änderung der Verordnung zur Gleichstellung von Prüfungszeugnissen des Staatlichen Berufskollegs Glas-Keramik-Gestaltung des Landes Nordrhein-Westfalen in Rheinbach mit den Zeugnissen über das Bestehen der Abschluss- und Gesellenprüfung in Ausbildungsberufen

29.06.2012: BGBl I: 2012, 1386 (Nr. 28)
Erste Verordnung zur Änderung der Verordnung zur Gleichstellung von Prüfungszeugnissen der Berufsfachschule  Handwerksberufe  an der Berufsbildenden Schule des Bezirksverbandes Pfalz in Kaiserslautern mit den Zeugnissen über das Bestehen der Abschluss- und Gesellenprüfung in Ausbildungsberufen 1388

29.06.2012: BGBl I: 2012, 1388 (Nr. 28)
Erste Verordnung zur Änderung der Verordnung zur Gleichstellung von Prüfungszeugnissen der Berufsfachschule für das Holz und Elfenbein verarbeitende Handwerk in Michelstadt mit den Zeugnissen über das Bestehen der Abschluss- und Gesellenprüfung in Ausbildungsberufen

29.06.2012: BGBl I: 2012, 1385 (Nr. 28)
Moving to 3.2.2 to fix JQuery dependencies
Added approving enrollment, skills listed on event page
Seperate pending and approved enrollments
Added to review table in event admin page
Merge branch 'master' of github.com:bxm156/ServicePad
fixed highlighting bugs
Merge branch 'master' of github.com:byang223/TurnBAPI
added comments to interactionPAssiveTurn
fix create booking
fix delete booking
Added/updated Design element lists.
connect: support different passwords per network through the network-name as env var
update readme
connect: default port should be 6667 - non-ssl
Silence on death!
Limted to 5 updates per second (also fixes tick problem, where updates would be needed to be done more than the tick rate itself)
Put smoothing back in.
Fixed following regarding all responses sync:

1) Sync responses button is disabled if there are no responses.
2) Sync summary is displayed properly.
3) The progress bar message is set to "Syncing Responses..."
Fixed the fetching of all question and surveys
move validation namespace to root
add doc update about new folder structure
Merge pull request #15 from cakephp/master-namespace

move validation namespace to root
Installation errors
fixed null pointer when creating keyword
localized backup file description
added alert to explain server config name in banner
translations for summary
remove: old extjs
some improvements for extractors
made coffee support conditional on a run-time check, and reflect this in the tests
Updates tests to reflect changes to Q.
Adds chapnum directive. Similar to Sectnum but adds space character at the end of the prefix. Adds a postprocessor (-p) option to the preprocessor to modify index.html file to have the right numbering for subsection when chapnum is used.
Fix the bug: when moving back, all hiden nodes of the tree display again.
Add the function for the "about" button.
Fix the bug: when moving back, all hidden nodes of the tree display again.
Add the function for "about" button.
More robust functions to store and send event data, prototype functions for storing and sending user's score data, prompt user to login whenever they do not have an existing valid session
Resolved conflict in ODSA.js
Merge branch 'master' of https://github.com/cashaffer/OpenDSA
Merge branch 'master' of https://github.com/cashaffer/OpenDSA
Add summary multiple choice questions to Sorting.rst module.
Merge branch 'master' of https://github.com/cashaffer/OpenDSA
More robust versions of event and score logging and transmission functions, event log and exercise score pushed to server on jsav-exercise-grade-change
Merge branch 'master' of https://github.com/cashaffer/OpenDSA
Merge branch 'master' of github.com:cashaffer/OpenDSA
Adding reset button to InssortPRO exercise.
Merge branch 'master' of https://github.com/cashaffer/OpenDSA
Copyedit modules
Polish InssortPRO exercise
Polish InssortPRO exercise
Merge branch 'master' of https://github.com/cashaffer/OpenDSA
Added flush_stored_data(), added code to dynamically attach loggers to all links and buttons, works for links, doesn't work for buttons, added check marks to show proficiency for inline AVs, changed send_av_scores to send av_scores individually because Django couldn't interpret the batch format
Fixed reset bug in InssortPRO exercise
Final cleanup for InssortPRO exercise
Updated/validated BubsortPRO exercise.
Merge branch 'master' of https://github.com/cashaffer/OpenDSA
Version bump and new libcassava
Making commands in zsh non-absolute
Updating documentation
Don't rely on ActiveSupport's String#starts_with?

When I was initially testing this, it was in the context of a Rails
application which defined String#starts_with?. In order to maintain
compatability for non-rails apps, use String#start_with? instead
(available on String since ruby 1.8.7).

Change-Id: I56e3cf09c5e916ffe541f15ac74c127ca9c4933d
Reviewed-on: https://gerrit.causes.com/9191
Reviewed-by: Lilia Markham <lilia.markham@causes.com>
Tested-by: Noah Silas <noah@causes.com>
Make stack_trace_interface public

A bug introduced in 9cad1abad. I really need to write tests for the
backtrace stuff and squash all this before I submit the pull request for
this refactor.

Change-Id: I968194fa9bf9df50bdef9ddc3fe4316e8ff726a2
Reviewed-on: https://gerrit.causes.com/9164
Reviewed-by: Joe Lencioni <joe.lencioni@causes.com>
Tested-by: Noah Silas <noah@causes.com>
Added path_add() func: add to path if the component is present and not already in path
Use these matrix benchmarks. Always partition into 256 blocks like LU
Forgot to add a GPL header to the Rehash blocks.
修改微博分享地址
Scripts/Commands: Add new command .cheat status, Shows active and inactive cheat.
Handing MOVE in munchStm (simple version).
Breaking munchStm(Stm) into one munchStm for each type of Stm.
robovac: Make vacControl work
robovac: Implimented portIDSetupCallback callback
robovac: Statemachine re-arrange & drawRunning()
robovac: code complete - undebugged
Remove `CollectionView#viewsByCid`, move to `@subview`.

The change will remove `viewsByCid` collection view mapping
for consistency with already existing `View#subview` method.

All child subviews can be identified by prefix “itemView:”.

Closes gh-190.
Remove `CollectionView#removeView` method.
Fix spelling.
Add `Collection#serialize`.

I don’t know if it’s really needed, though. Is it?
Fix typo.
Merge pull request #203 from chaplinjs/topics/subview-collection-view

Remove `CollectionView#viewsByCid`, move to `@subview`.
Test Collection#serialize explicitly, style changes
Remove meaningless SyncMachine tests
Merge pull request #204 from chaplinjs/topics/collection-serialize

Add `Collection#serialize`.
Merge branch 'master' into topics/collection-view-auto-render

Conflicts:
	src/chaplin/views/collection_view.coffee
yeah
add coderay back to gemfile
output integers without decimal places
add set, list and quoting
add if
add True
fix options in Regexp.new reading from first arg
regexp test
New commits for vim plugins
Remove accented letters from name.
Improve muttrc.
cd into gem directory and then open vim
Add mapping for Guillemot signs
browserid login, sessions missing still though
initial commit
Merge branch 'master' of https://github.com/chemone/autoXenon.git
new file:   example/Makefile
	new file:   example/freedown.c
	modified:   log/process_note
	modified:   src/http.c
	modified:   src/http.h
	modified:   src/mbdown.c
	modified:   src/start.sh
	deleted:    src/tags
	modified:   src/url.c
Modify .gitignore to ignore files made by configure.
Re Push
Re Push
Added travis-ci.org build status to README.
- Added extension to README to allow github to parse for Markdown.
Fixed lines that we're going over 80 columns.
Added *.swp to .gitignore
Reorganized build and dependency building.

Benchtest and tests are not yet building properly. There is a slew of
changes coming in the next few commits that are required to make this
build.

- Removed the old deps/libev and replaced with the unmodified
  libev-4.11 tarball that is available at libev.schmorp.de.
- Created new Makefiles, one per sub-task. The makefile in the root
  directory is to build the complete projet, while the Makefile in
  test/ deps/ src/ are for building these tasks.
Fixed a dependency issue in makefile.
Added .gitignore to test/ and fixed test dependencies.
Fixed the makefiles for test/ and src/ tasks.
Added a contributors list to README.md
Fixed the chinook link in README
Merge pull request #1 from limoges/master

Build re-architecture
Visual-mode shortcuts for roxygen comments

`,c` wraps text with `\code{}`, etc.
Disable Vim-R underscore completion

Finally giving in to Hadley's conventions!
Testing diff by adding comment to Compile.py
Start of javascript grid images

- For now using fake holding images

Signed-off-by: karmatosed <karmatosed@gmail.com>
very raw first steps using simplified multiple arguments
better handling of the idx stack
simple size dependencies added

It is actually not quite trivial to allow for linked regions and other
fun if you want to let the compiler figure out what to do.

The solution, for now, is to have constraint kinds, and allow for
arbitrary constraints based on type classes.

At least for the smallish example I am using now, this leads to
efficient code (funnily enough). Now blowing up to something real ...
Deep example breaks complete fusion, unfortunately
this version descends the index stack

again, we use constraint kinds to allow dynamic class constraints.
dynamic as in the user can write constraints and apply them to the index
stack. the compiler compiles into efficient code

note that this is the ``tech demo'', not working code as in working on
the level of CFGs or anything ...
playing around with stream/streamlast
preparing for full idx/adx/arg mode
added argument indices (ADX)
testing performance of GAPlike addition

using criterion
more criterion testing
version bumping for first Nussinov tests
additional changes
gaplike experiments
maybe a working gaplike system using constraints
removed the seq's for now
playing with mutable vectors
explicit type annotations to step fix speed problems
nice core if having step type explicit
fused code looks good

on larger example too
let's get serious with testing
Suppress "possible EventEmitter memory leak detected" error since we are definitely going over 11 when we recurse into subdirectories
Actualize C.U.E y agregué mas diagramas

Eliminé el caso de uso 'Listar Rol'
Added module browser branch

--HG--
branch : modulebrowser
Reinstate support for bare repositories.
Add @api tag to support splitting of docs
Improved urls of static content pages.
Refactored tests.
Added Sign Up page
Refactoring from rakefile to plain ruby and shell script.
Update gnutls to 3.1.5.

	modified:   base/gnutls/gnutls.build
removed html5 version
services - first version
Updates zsh theme
Refactored hosting model to avoid inheritance for package authors.
Renamed Core to Clide. Moved batch file on level up, as well as the resulting nupkg.
Fixed compilation conditionals for Clide so it builds with VS2012 assembly references when building for that platform.
Renamed Core to Clide (folder).
Updated batch file and ignores for new folder path.
created ramboia logger.
Add comments
Fix tasks getting lost
Fix: Not setting tcb[curTask].event on semWait
Added ignore list module

Still needs a lot of code clean up, this is a very early prototype.
Works, sort of...
Hide blobstore id when downloading packages

Atmos blobstore ids tend to be too long and too much
noise to the output.

Change-Id: I6b853adaa137d723d5a0b0b87d5c493e2b14e8ed
Merge "Hide blobstore id when downloading packages"
Add .travis.yml
Add build status to readme.
Merge branch 'master' of github.com:cloudkick/whiskey into spyon
added maven to project
got the rest of the current windows wired up
Merge branch 'master' of github.com:cmwalker25/Tuxedo
Added AllowOfflineMute option.
EpicBoss integration
fixed #1610:skip only white character
Merge pull request #1751 from minggo/iss1610_labelttf

fixed #1610:skip only white character
remove 4.7 repos
+FAQ-1.html
all pages
fix(part-1)
Changed names in intro
Changed names in intro
Changed the way sending info from client

First the client send which key was pressed, now the position of the
player
chaining test
added mid_x and mid_y methods
converted position methods (#{top,center,bottom}_{left,center,right}) to use same absolute/relative argument as #center method
tests for previous commit
tests for {min,mid,max}_{x,y} and test that CGRect#{x,y,width,height} always return normalized numbers
some documentation regarding absolute vs relative positioning
bashrc,zshrc: fix type usage
bashrc,zshrc: improve colour handling on FreeBSD and darwin
Change handle cursor to row-resize.
First attempt to integrate sketch with hangouts
Provide empty shared whiteboard data by default
Back to Solarized!
More vim tweaking
Mentioned the Eclipse plugin project
Added functions for board management.
Sent output to /dev/null
Site updated at 2012-06-27 14:24:18 UTC
updated to use soft request method for req_parse choice
Add file to tests/tmp
Fix for older versions of sudo.

The version of sudo with Ubuntu 8.04 (1.6.9p10) does not allow the
-k and -u options to be used together.
Objects that are session-scoped now get saved as session objects on the server.
fixing dns lib reference from lwt that I messed up
PhotoListAcivity : Tanvir
HIEU
adding more figures from Sean.
Update curl submodule. Tweak README
Updating demo versions.
Begining updates to make this work on SDSC swift
Added logo
Merge branch 'master' of ssh://git@github.com/cyriux/Patternity.git
Added JavaDoc comments to mostly everything.
fixing missing package reference.
research entries
main with all project at all;
serious views refactoring; added master controller for master interactions
more sub love
Merge branch 'master' of https://github.com/dakin/Project-D-B

Conflicts:
	css/main.css
	css/sub-nav.scss
Typo.

Fixed typo.
updated readme with new naming scheme
a bit o' cleanup
naplneni readme2
tak jsem pridal hlavni veci..
Added auto-generated output of my ~/.janus dir
Updated README to mention this
update create del cmsa rm tmp/a.txt
chr missing
# First release
Fixed sort order

The app was arranging items from oldest to newest.
record number of prologue/epilogue lines in ProgramSource object
even new strategy
updated some queries
heaps of changes. code isn't as crap. read diff
added 2 helper func to convert datatime to wxdatetime
updated
ignore wombat directory
compose finished
Stuff for Movie and Filmography models and other long forgotten junk
upload .vim folder
Added functionality sign in via Devise provided-form
Added files and logic to support zsh
Removed reference to generic .zshrc
Turned off the disabling of fast forward commits.
bassdrum
environment.jpg
Merge branch 'master' of github.com:dennda/awesomovie
add switch to text mode code. it doesn't work now.
a useless commit
Adding test which crashes PhantomJS
Merge pull request #103 from jimevans/async_crash

TEST: Adding async script test which crashes PhantomJS
Fix product images index view
wq
:w
Merge branch 'master' of https://github.com/devmario/VBEngine
Minor changes in Sec. II

- correct typos
- Fig. 3 (still Fig. 3) and Fig. 4 (now Fig. 20) rearranged
- slightly clearer text
vimrc: TDD setup from Vim using vimux + turbux + spork
formatting
solved problem #45
solved problem #47
solved problem #52
Added a Pages controller.
Done with static pages.
KERN-2919 commented out 1.7 build and modified README-java-1.7 to indicate how to enable 1.7 build
Fixed pagination & updated post list
Use max<size_t> to instance template function, for fixing compilation error on x64 platforms.
Merge pull request #142 from Len3d/master

Fixed compilation on 64-bit Windows.
updated the devkit sample.

- added environment lighting.
- the sample is now started in the directory of the project file, and the PATH environment variable is set to point to the appleseed DLLs.
Merge branch 'master' of github.com:jupiter-jazz/appleseed
tweaked light sampler API to prevent inefficient uses.
removed incorrect warning message.
lots of fixes, improvements and new developments for rendering the trees of Mescaline.

- new diffuse BTDF.
- non-physically based "leaf" surface shader (deprecated, will not be merged).
- BSDF are now classified as reflective or transmissive for correct next event estimation of non-specular transmissive surfaces in the path tracer.
- replaced single multiplier in texture instance by separate color and alpha multipliers.
- don't handle alpha mapping for primary rays in the path tracer, this is already done by the generic sampler renderer.
- handle alpha values larger than 1 in the tracer.
forgot to add two new files to CMakeLists.txt.
it is now possible to specify a default value in input declarations.
removed special-purpose Leaf surface shader.
make it clear that the Smoke surface shader is experimental.
cleanups.
added missing 'override' keywords (#R4).
small code tweaks related to construction of file paths.
added diffuse and glossy reflectance multipliers to the Ashikhmin-Shirley BRDF.
renamed 'reflectance' input to 'transmittance' and added transmittance multiplier to diffuse BTDF.
added matte and specular reflectance multipliers to the Kelemen BRDF.
added reflectance multipliers to the Lambertian and perfectly specular BRDF.
split 'reflectance' into 'reflectance' and 'transmittance' and added reflectance and transmittance multipliers to the perfectly specular BTDF.
added exitance multiplier to the perfectly diffuse EDF.
Removed logo

Better integration with iframe in app.
Version 1.01 - Reports added with user roles and priviledges
changed roadmap a bit
added README file for git hub
Remove snippets
Add snippets submodule
Remove snippets module
Update submodule
Moved class to more appropriate place.
srtp: Fix cryptocontext constructors

macCtx should be initialized explicitly inside constructor to NULL,
otherwise it will be initialized by random value, destructor
will pass (macCtx != NULL) check and will try to deallocate that junk.
Merge pull request #1 from dmonakhov/devel

srtp: Fix cryptocontext constructors
added calcmld.m
Alises for unsecure ssh/scp.
livecheck:
FIX: fixed problem with long plugin output
FIX: added /0 termination to strings
FIX: changed check_type to be always active (0)
Fehler gefunden, aber noch nicht behoben (Ursache unbekannt)
okay, got snob working, a cli and it should be self hosting
added timestamps
start on detailed explaination
poprawki wygladowe kodu
poprawki do backupu plikow a takze do generowania konfigow nagios
adding mixpanel name_tag
Fixes for upcoming view.
Fixes Issue #834 , accessing an artist by a secondary id will now abort the update process and add the artists primary id to the database instead, this should solve most dupes.

If the artist is already in the database with a secondary id all data attached to the artist will be reassigned to the correct id.
Merge branch 'issue834'
removed multi statements